diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-02-10 07:46:13 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-02-10 07:46:13 +0000 |
commit | 29d78cbe1d1c612fd4f8128ce799126fa4b7f04a (patch) | |
tree | 8df72ed476209c508f4ea3586dd9d1304282a82a /install.php | |
parent | ccaaf69da54680e910689f131625338cbf844941 (diff) | |
download | brdo-29d78cbe1d1c612fd4f8128ce799126fa4b7f04a.tar.gz brdo-29d78cbe1d1c612fd4f8128ce799126fa4b7f04a.tar.bz2 |
- Patch #209240 by saxofaan, mike stewart, gopherspidey: fixed installation problem with multi-site setups.
Diffstat (limited to 'install.php')
-rw-r--r-- | install.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install.php b/install.php index 2e7fea6de..a9ce9fcf8 100644 --- a/install.php +++ b/install.php @@ -159,7 +159,7 @@ function install_verify_settings() { $db_host = urldecode($url['host']); $db_port = isset($url['port']) ? urldecode($url['port']) : ''; $db_path = ltrim(urldecode($url['path']), '/'); - $settings_file = './'. conf_path() .'/settings.php'; + $settings_file = './'. conf_path(FALSE, TRUE) .'/settings.php'; $form_state = array(); _install_settings_form_validate($db_prefix, $db_type, $db_user, $db_pass, $db_host, $db_port, $db_path, $settings_file, $form_state); @@ -182,7 +182,7 @@ function install_change_settings($profile = 'default', $install_locale = '') { $db_host = isset($url['host']) ? urldecode($url['host']) : ''; $db_port = isset($url['port']) ? urldecode($url['port']) : ''; $db_path = ltrim(urldecode($url['path']), '/'); - $conf_path = './'. conf_path(); + $conf_path = './'. conf_path(FALSE, TRUE); $settings_file = $conf_path .'/settings.php'; // We always need this because we want to run form_get_errors. @@ -866,7 +866,7 @@ function install_check_requirements($profile, $verify) { // If Drupal is not set up already, we need to create a settings file. if (!$verify) { $writable = FALSE; - $conf_path = './'. conf_path(); + $conf_path = './'. conf_path(FALSE, TRUE); $settings_file = $conf_path .'/settings.php'; $file = $conf_path; // Verify that the directory exists. |