Skip to content
Browse files

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

  • Loading branch information...
2 parents e32d5f9 + e92977d commit c055cebfbbd716067788f7b11ef7846df0f4e49d @skodak skodak committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 install.php
View
4 install.php
@@ -306,7 +306,7 @@
$a = new stdClass();
$a->parent = dirname($CFG->dataroot);
$a->dataroot = $CFG->dataroot;
- if (!is_writable(dirname($CFG->dataroot))) {
+ if (!is_writable($a->parent)) {
$hint_dataroot = get_string('pathsroparentdataroot', 'install', $a);
$config->stage = INSTALL_PATHS;
} else {
@@ -317,7 +317,7 @@
}
} 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;
}

0 comments on commit c055ceb

Please sign in to comment.
Something went wrong with that request. Please try again.