summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2013-02-09 13:11:05 +1100
committerDries2013-02-09 13:11:05 +1100
commit4112202cb76717563edcaedb96f16dd58700bb8c (patch)
tree83880ed7e906565b6f1c06f5cfba0537ca41f025
parent3721e4d262af2d589345693610112512e653afe3 (diff)
Issue #1881992 by mitron, karschsp: Remove () global.
-rw-r--r--core/includes/bootstrap.inc2
-rw-r--r--core/includes/install.core.inc7
2 files changed, 3 insertions, 6 deletions
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 7b3e2e0..663d53b 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -716,7 +716,7 @@ function drupal_settings_initialize() {
global $base_url, $base_path, $base_root, $script_path;
// Export these settings.php variables to the global namespace.
- global $databases, $cookie_domain, $conf, $installed_profile, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directories;
+ global $databases, $cookie_domain, $conf, $installed_profile, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directories;
$conf = array();
// Make conf_path() available as local variable in settings.php.
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 9d68398..ec5ec0e 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -392,11 +392,8 @@ function install_begin_request(&$install_state) {
else {
$task = NULL;
- // Do not install over a configured settings.php. Check the 'db_url'
- // variable in addition to 'databases', since previous versions of Drupal
- // used that (and we do not want to allow installations on an existing site
- // whose settings file has not yet been updated).
- if (!empty($GLOBALS['databases']) || !empty($GLOBALS['db_url'])) {
+ // Do not install over a configured settings.php.
+ if (!empty($GLOBALS['databases'])) {
throw new Exception(install_already_done_error());
}
}