Commit fe9978cc authored by webchick's avatar webchick
Browse files

Issue #1805324 by Berdir: Fixed Installer does not verify readability of settings.php.

parent 9f4ce691
......@@ -1784,7 +1784,8 @@ function install_check_requirements($install_state) {
// having settings.php also owned by the webserver does not introduce
// any additional security risk, so we keep the file in place.
if (fileowner($default_settings_file) === fileowner($settings_file)) {
$writable = drupal_verify_install_file($settings_file, FILE_READABLE|FILE_WRITABLE);
$readable = drupal_verify_install_file($settings_file, FILE_READABLE);
$writable = drupal_verify_install_file($settings_file, FILE_WRITABLE);
$exists = TRUE;
}
// If settings.php and default.settings.php have different owners, this
......@@ -1808,7 +1809,8 @@ function install_check_requirements($install_state) {
$exists = !$deleted;
if ($exists) {
$settings_file_ownership_error = TRUE;
$writable = drupal_verify_install_file($settings_file, FILE_READABLE|FILE_WRITABLE);
$readable = drupal_verify_install_file($settings_file, FILE_READABLE);
$writable = drupal_verify_install_file($settings_file, FILE_WRITABLE);
}
}
}
......
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