MDL-17694: very small stickyblocks improvements (Merged from MOODLE_19_STABLE)

diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index 892c00bcaef807c55bcc4ec918424e02469cf6d6..1b7a92d1cdb66851112034cbccaece62bf546760 100644 (file)
--- a/blocks/admin/block_admin.php
+++ b/blocks/admin/block_admin.php
@@ -19,6 +19,12 @@ class block_admin extends block_list {
         $this->content->icons = array();
         $this->content->footer = '';
 
+        if (empty($this->instance->pageid)) { // sticky
+            if (!empty($COURSE)) {
+                $this->instance->pageid = $COURSE->id;
+            }
+        }
+
         if (empty($this->instance)) {
             return $this->content = '';
         } else if ($this->instance->pageid == SITEID) {

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 9b1b648ca2f8be6dc04c13a8e71b3b504651e68c..eb9aa3cc209d93136a01cc7a8a63370f97b989be 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -367,7 +367,7 @@ function blocks_print_group(&$page, &$pageblocks, $position) {
 
     if ($page->blocks_default_position() == $position &&
         $page->user_is_editing() &&
-        ($managecourseblocks || $editmymoodle || $myownblogpage)) {
+        ($managecourseblocks || $editmymoodle || $myownblogpage || defined('ADMIN_STICKYBLOCKS'))) {
 
         blocks_print_adminblock($page, $pageblocks);
     }