mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-12-19 15:46:54 +00:00
commit caf52b578b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/blocklib.php
View File

@ -246,7 +246,7 @@ class block_manager {
return false;
}
$undeletableblocks = self::get_undeletable_block_types();
$requiredbythemeblocks = self::get_required_by_theme_block_types();
foreach ($this->blockinstances as $region) {
foreach ($region as $instance) {
if (empty($instance->instance->blockname)) {
@ -254,7 +254,7 @@ class block_manager {
}
if ($instance->instance->blockname == $blockname) {
if ($instance->instance->requiredbytheme) {
if (!in_array($block->name, $undeletableblocks)) {
if (!in_array($blockname, $requiredbythemeblocks)) {
continue;
}
}