mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-10-16 14:35:28 +08:00
commit ea0a092e99
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/blocklib.php
View File

@ -454,7 +454,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;
}