Merge branch 'MDL-34742-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE

2012-08-21 11:59:38 +08:00
parent 06d9aa79b8 83985d7856
commit 08d2cbe451
1 changed files with 6 additions and 0 deletions
@@ -454,6 +454,12 @@ class block_manager {
        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) {