Merge branch 'MDL-39552' of git://github.com/stronk7/moodle

This commit is contained in:
Dan Poltawski 2013-05-08 13:03:58 +01:00
commit ae3507af09

View File

@ -107,7 +107,8 @@ if (!empty($CFG->behat_switchcompletely)) {
// Test environment is enabled if:
// * User has previously enabled through admin/tool/behat/cli/util.php --enable.
// Both are required to switch to test mode
if (!empty($CFG->behat_dataroot) && !empty($CFG->behat_prefix) && file_exists($CFG->behat_dataroot)) {
if (!defined('BEHAT_SITE_RUNNING') && !empty($CFG->behat_dataroot) &&
!empty($CFG->behat_prefix) && file_exists($CFG->behat_dataroot)) {
$CFG->behat_dataroot = realpath($CFG->behat_dataroot);