From 3a35e28f923e887c0ef486753b6a926e4dee3662 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 2 Apr 2009 20:39:45 +0000 Subject: - 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! --- includes/install.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'includes/install.inc') 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(); -- cgit v1.2.3