Permalink
Browse files

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

…dle into MOODLE_22_STABLE
  • Loading branch information...
2 parents d270f6c + faaa97b commit d44a43190abd7c249ed280418c52e5e64a39671c @danpoltawski danpoltawski committed Oct 16, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 lib/blocklib.php
View
4 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;
}

0 comments on commit d44a431

Please sign in to comment.