diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-04-02 20:39:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-04-02 20:39:45 +0000 |
| commit | 3a35e28f923e887c0ef486753b6a926e4dee3662 (patch) | |
| tree | e9e41dd8e9c638b9225dd68d7c689dc9e8429209 /install.php | |
| parent | b25e08ba75174654136f409871d4dd059872bf1d (diff) | |
| download | brdo-3a35e28f923e887c0ef486753b6a926e4dee3662.tar.gz brdo-3a35e28f923e887c0ef486753b6a926e4dee3662.tar.bz2 | |
- Patch #254491 by chx, catch, justinrandell, pwolanin, David_Rothstein, et al: centralized static caching to improve testability of the Drupal code, and to remove $reset-parameters. Thanks for taking the time to convince me, catch!
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/install.php b/install.php index 4065fb06f..f154de33a 100644 --- a/install.php +++ b/install.php @@ -185,7 +185,8 @@ function install_verify_settings() { include_once DRUPAL_ROOT . '/includes/form.inc'; $database = $databases['default']['default']; - $settings_file = './' . conf_path(FALSE, TRUE) . '/settings.php'; + drupal_static_reset('conf_path'); + $settings_file = './' . conf_path(FALSE) . '/settings.php'; $form_state = array(); _install_settings_form_validate($database, $settings_file, $form_state); @@ -202,7 +203,8 @@ function install_verify_settings() { function install_change_settings($profile = 'default', $install_locale = '') { global $databases, $db_prefix; - $conf_path = './' . conf_path(FALSE, TRUE); + drupal_static_reset('conf_path'); + $conf_path = './' . conf_path(FALSE); $settings_file = $conf_path . '/settings.php'; $database = isset($databases['default']['default']) ? $databases['default']['default'] : array(); |