From fe9978cc54325d13cb65b523bcd83cbe756d02e1 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Mon, 26 Nov 2012 14:17:56 -0800
Subject: [PATCH] Issue #1805324 by Berdir: Fixed Installer does not verify
readability of settings.php.
---
core/includes/install.core.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 24ceaf26542a..ce67e408942a 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -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);
}
}
}
--
GitLab