L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-30381-dataroot-install' of git://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-23 01:11:01 +01:00
parent 7242b051ac fbe33209ce
commit 8ea233e7ad
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cli/install.php
+8 -6
View File
@@ -133,9 +133,6 @@ $CFG->dirroot = dirname(dirname(dirname(__FILE__)));
$CFG->libdir = "$CFG->dirroot/lib";
$CFG->wwwroot = "http://localhost";
$CFG->httpswwwroot = $CFG->wwwroot;
$CFG->dataroot = str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata');
$CFG->tempdir = $CFG->dataroot.'/temp';
$CFG->cachedir = $CFG->dataroot.'/temp';
$CFG->docroot = 'http://docs.moodle.org';
$CFG->running_installer = true;
$CFG->early_install_lang = true;
@@ -186,7 +183,7 @@ list($options, $unrecognized) = cli_get_params(
'chmod' => '2777',
'lang' => $CFG->lang,
'wwwroot' => '',
'dataroot' => $CFG->dataroot,
'dataroot' => str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata'),
'dbtype' => $defaultdb,
'dbhost' => 'localhost',
'dbname' => 'moodle',
@@ -330,9 +327,12 @@ $CFG->httpswwwroot = $CFG->wwwroot;
//We need dataroot before lang download
if (!empty($options['dataroot'])) {
$CFG->dataroot = $options['dataroot'];
$dataroot = clean_param($options['dataroot'], PARAM_PATH);
if ($dataroot !== $options['dataroot']) {
$a = (object)array('option' => 'dataroot', 'value' => $options['dataroot']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
$CFG->dataroot = $dataroot;
if ($interactive) {
cli_separator();
$i=0;
@@ -380,6 +380,8 @@ if ($interactive) {
cli_error(get_string('pathserrcreatedataroot', 'install', $a));
}
}
$CFG->tempdir = $CFG->dataroot.'/temp';
$CFG->cachedir = $CFG->dataroot.'/cache';
// download required lang packs
if ($CFG->lang !== 'en') {