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 /includes/install.inc | |
| 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 'includes/install.inc')
| -rw-r--r-- | includes/install.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/install.inc b/includes/install.inc index 6eaf8db2c..7cd4c7038 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -335,7 +335,8 @@ abstract class DatabaseInstaller { */ function drupal_rewrite_settings($settings = array(), $prefix = '') { $default_settings = 'sites/default/default.settings.php'; - $settings_file = conf_path(FALSE, TRUE) . '/' . $prefix . 'settings.php'; + drupal_static_reset('conf_path'); + $settings_file = conf_path(FALSE) . '/' . $prefix . 'settings.php'; // Build list of setting names and insert the values into the global namespace. $keys = array(); |