Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle

Conflicts: lib/phpunit/bootstrap.php
2014-06-04 10:07:03 +08:00
parent 0591c2056d 1bce3a70d9
commit 0313897108
10 changed files with 61 additions and 12 deletions
@@ -181,7 +181,7 @@ $CFG->dboptions = isset($CFG->phpunit_dboptions) ? $CFG->phpunit_dboptions : $CF
 $allowed = array('wwwroot', 'dataroot', 'dirroot', 'admin', 'directorypermissions', 'filepermissions',
                 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix', 'dboptions',
                 'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword', 'proxybypass', // keep proxy settings from config.php
-                 'altcacheconfigpath'
+                 'altcacheconfigpath', 'pathtogs', 'pathtoclam', 'pathtodu', 'aspellpath', 'pathtodot'
                );
 $productioncfg = (array)$CFG;
 $CFG = new stdClass();