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

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

Browse Source
This commit is contained in:
Dan Poltawski 2016-11-28 08:30:37 +00:00
commit 1cbc346092
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/blocklib.php
View File

@ -1053,6 +1053,11 @@ class block_manager {
return; return;
} }
// Never add a duplicate block required by theme.
if ($DB->record_exists('block_instances', array('blockname' => $blockname, 'requiredbytheme' => 1))) {
return;
}
$systemcontext = context_system::instance(); $systemcontext = context_system::instance();
$defaultregion = $this->get_default_region(); $defaultregion = $this->get_default_region();
// Add a special system wide block instance only for themes that require it. // Add a special system wide block instance only for themes that require it.