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

2012-10-04 17:27:52 +08:00
parent c5575c63b8
commit faaa97b415
1 changed files with 3 additions and 1 deletions
@@ -451,7 +451,9 @@ class block_manager {
     * @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;
        }