mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-15 13:24:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-25780' of git://git.luns.net.uk/moodle

Browse Source
This commit is contained in:
Petr Skoda 2011-02-07 21:49:32 +01:00
commit c055cebfbb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.php
View File

@ -306,7 +306,7 @@ if ($config->stage == INSTALL_DOWNLOADLANG) {
$a = new stdClass(); $a = new stdClass();
$a->parent = dirname($CFG->dataroot); $a->parent = dirname($CFG->dataroot);
$a->dataroot = $CFG->dataroot; $a->dataroot = $CFG->dataroot;
if (!is_writable(dirname($CFG->dataroot))) { if (!is_writable($a->parent)) {
$hint_dataroot = get_string('pathsroparentdataroot', 'install', $a); $hint_dataroot = get_string('pathsroparentdataroot', 'install', $a);
$config->stage = INSTALL_PATHS; $config->stage = INSTALL_PATHS;
} else { } else {
@ -317,7 +317,7 @@ if ($config->stage == INSTALL_DOWNLOADLANG) {
} }
} else if (!install_init_dataroot($CFG->dataroot, $CFG->directorypermissions)) { } else if (!install_init_dataroot($CFG->dataroot, $CFG->directorypermissions)) {
$hint_dataroot = get_string('pathserrcreatedataroot', 'install', $a); $hint_dataroot = get_string('pathserrcreatedataroot', 'install', array('dataroot' => $CFG->dataroot));
$config->stage = INSTALL_PATHS; $config->stage = INSTALL_PATHS;
} }