Commit 25581f13 authored by Nigel McNie's avatar Nigel McNie
Browse files

Explicitly include the config.php in docroot.

If we don't, a 'config.php' earlier on the include path can wreak havoc.
This appears to happen on some windows based setups.
parent 4edd27ad
......@@ -55,7 +55,7 @@ if (!is_readable($CFG->docroot . 'config.php')) {
init_performance_info();
require('config.php');
require($CFG->docroot . 'config.php');
$CFG = (object)array_merge((array)$cfg, (array)$CFG);
require_once('config-defaults.php');
$CFG = (object)array_merge((array)$cfg, (array)$CFG);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment