mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-mdl-57232' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-12-02 15:00:48 +00:00
commit 65cc788bb1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/behat/classes/util.php
View File

@ -108,9 +108,6 @@ class behat_util extends testing_util {
set_config('debug', DEBUG_DEVELOPER);
set_config('debugdisplay', 1);
// Force the navigation and settings blocks, even if the theme has made them optional.
set_config('undeletableblocktypes', 'navigation,settings');
// Disable some settings that are not wanted on test sites.
set_config('noemailever', 1);

5
lib/blocklib.php
View File

@ -387,7 +387,10 @@ class block_manager {
$requiredbythemeblocks = $PAGE->theme->requiredblocks;
}
if ($requiredbythemeblocks === false) {
// We need blocks for behat, till MDL-56614 gets in.
if (defined('BEHAT_SITE_RUNNING')) {
return array('navigation', 'settings');
} else if ($requiredbythemeblocks === false) {
return array('navigation', 'settings');
} else if ($requiredbythemeblocks === '') {
return array();