summaryrefslogtreecommitdiff
path: root/includes/install.core.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-11-05 20:53:38 +0000
committerDries Buytaert <dries@buytaert.net>2010-11-05 20:53:38 +0000
commit7ab426ecae5e383ee1c662756e89320207f91cbd (patch)
tree368c23977c7c3c4f53780189cca9f4b3d1d67d95 /includes/install.core.inc
parent2eb25ee70f93546da990a670a6bb329904de9f31 (diff)
downloadbrdo-7ab426ecae5e383ee1c662756e89320207f91cbd.tar.gz
brdo-7ab426ecae5e383ee1c662756e89320207f91cbd.tar.bz2
- Patch #689954 by Mark Trapp: installation complete message doesn't conform to Drupal path conventions.
Diffstat (limited to 'includes/install.core.inc')
-rw-r--r--includes/install.core.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/install.core.inc b/includes/install.core.inc
index 427753c3b..179d6b84d 100644
--- a/includes/install.core.inc
+++ b/includes/install.core.inc
@@ -1458,9 +1458,9 @@ function install_configure_form($form, &$form_state, &$install_state) {
drupal_set_title(st('Configure site'));
// Warn about settings.php permissions risk
- $settings_dir = './' . conf_path();
+ $settings_dir = conf_path();
$settings_file = $settings_dir . '/settings.php';
- if (!drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE) || !drupal_verify_install_file($settings_dir, FILE_NOT_WRITABLE, 'dir')) {
+ if (!drupal_verify_install_file(DRUPAL_ROOT . '/' . $settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE) || !drupal_verify_install_file(DRUPAL_ROOT . '/' . $settings_dir, FILE_NOT_WRITABLE, 'dir')) {
drupal_set_message(st('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the <a href="@handbook_url">online handbook</a>.', array('%dir' => $settings_dir, '%file' => $settings_file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'warning');
}
else {