L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-73402-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2021-12-29 10:08:04 +01:00
parent 2d05bbbf4c a8a8555b4f
commit 4e2cfa0fe0
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/admin_bookmarks/block_admin_bookmarks.php
+2 -3
View File
@@ -32,8 +32,6 @@ class block_admin_bookmarks extends block_base {
/** @var string */
public $blockname = null;
/** @var bool */
protected $contentgenerated = false;
/** @var bool|null */
protected $docked = null;
@@ -74,9 +72,10 @@ class block_admin_bookmarks extends block_base {
global $CFG;
// First check if we have already generated, don't waste cycles
if ($this->contentgenerated === true) {
if ($this->content !== null) {
return $this->content;
}
$this->content = new stdClass();
if (get_user_preferences('admin_bookmarks')) {
blocks/admin_bookmarks/create.php
+2 -1
View File
@@ -30,7 +30,8 @@ $context = context_system::instance();
$PAGE->set_context($context);
$adminroot = admin_get_root(false, false); // settings not required - only pages
if ($section = optional_param('section', '', PARAM_SAFEDIR) and confirm_sesskey()) {
// We clean section with safe path here for compatibility with external pages that include a slash in their name.
if ($section = optional_param('section', '', PARAM_SAFEPATH) and confirm_sesskey()) {
if (get_user_preferences('admin_bookmarks')) {
$bookmarks = explode(',', get_user_preferences('admin_bookmarks'));
blocks/admin_bookmarks/delete.php
+2 -1
View File
@@ -31,7 +31,8 @@ $context = context_system::instance();
$PAGE->set_context($context);
$adminroot = admin_get_root(false, false); // settings not required - only pages
if ($section = optional_param('section', '', PARAM_SAFEDIR) and confirm_sesskey()) {
// We clean section with safe path here for compatibility with external pages that include a slash in their name.
if ($section = optional_param('section', '', PARAM_SAFEPATH) and confirm_sesskey()) {
if (get_user_preferences('admin_bookmarks')) {