From: mjollnir_ <mjollnir_>
Date: Fri, 19 Dec 2008 09:49:33 +0000 (+0000)
Subject: MDL-17694: very small stickyblocks improvements (Merged from MOODLE_19_STABLE)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ee1efe0b0f5f2b0920036ef3683b5175db3b8a51;p=moodle.git

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 892c00bcae..1b7a92d1cd 100644
--- 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 9b1b648ca2..eb9aa3cc20 100644
--- 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);
     }