moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle

Browse source
This commit is contained in:
Dan Poltawski 2013-02-19 11:34:07 +08:00
commit 7e94bdcca1
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/tool/behat/cli/util.php
View file

@ -84,6 +84,7 @@ error_reporting(E_ALL | E_STRICT);
ini_set('display_errors', '1'); ini_set('display_errors', '1');
ini_set('log_errors', '1'); ini_set('log_errors', '1');
// Getting $CFG data.
require_once(__DIR__ . '/../../../../config.php'); require_once(__DIR__ . '/../../../../config.php');
// CFG->behat_prefix must be set and with value different than CFG->prefix and phpunit_prefix. // CFG->behat_prefix must be set and with value different than CFG->prefix and phpunit_prefix.
@ -141,6 +142,10 @@ foreach ($vars as $var) {
$CFG->noemailever = true; $CFG->noemailever = true;
$CFG->passwordsaltmain = 'moodle'; $CFG->passwordsaltmain = 'moodle';
// Unset cache and temp directories to reset them again with the new $CFG->dataroot.
unset($CFG->cachedir);
unset($CFG->tempdir);
// Continues setup. // Continues setup.
define('ABORT_AFTER_CONFIG_CANCEL', true); define('ABORT_AFTER_CONFIG_CANCEL', true);
require("$CFG->dirroot/lib/setup.php"); require("$CFG->dirroot/lib/setup.php");