Merge branch 'MDL-34742-23' of git://github.com/FMCorz/moodle into MO…

…ODLE_23_STABLE
moodle · Aug 21, 2012 · ed22220 · ed22220
2 parents 8172f3b + 054bcf6
commit ed22220
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/blocklib.php b/lib/blocklib.php
@@ -457,6 +457,12 @@ public function region_completely_docked($region, $output) {
         if (!$this->page->theme->enable_dock) {
             return false;
         }
+
+        // Do not dock the region when the user attemps to move a block.
+        if ($this->movingblock) {
+            return false;
+        }
+
         $this->check_is_loaded();
         $this->ensure_content_created($region, $output);
         foreach($this->visibleblockcontent[$region] as $instance) {