MDL-32218 Blocks: allowblockstodock is also checked for region dock s…

…tatus
moodle · Oct 4, 2012 · 2bb1d1f · 2bb1d1f
1 parent 5d6285c
commit 2bb1d1f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/blocklib.php b/lib/blocklib.php
@@ -454,7 +454,9 @@ public function add_pretend_block($bc, $region) {
      * @return bool True if all of the blocks within that region are docked
      */
     public function region_completely_docked($region, $output) {
-        if (!$this->page->theme->enable_dock) {
+        global $CFG;
+        // If theme doesn't allow docking or allowblockstodock is not set, then return.
+        if (!$this->page->theme->enable_dock || empty($CFG->allowblockstodock)) {
             return false;
         }