Permalink
Browse files

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

…tatus
  • Loading branch information...
1 parent c5575c6 commit faaa97b4156de0d3dbeabf6a6c7bb977a735172e Rajesh Taneja committed Oct 4, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 lib/blocklib.php
View
@@ -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 faaa97b

Please sign in to comment.