Merge branch 'wip-mdl-32218-m22' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_22_STABLE
moodle · Oct 16, 2012 · d44a431 · d44a431
2 parents d270f6c + faaa97b
commit d44a431
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/blocklib.php b/lib/blocklib.php
@@ -451,7 +451,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;
         }