From b9127101ffeca819e74a03fa9f5a48d026c562e5 Mon Sep 17 00:00:00 2001 From: David Rothstein Date: Wed, 17 Oct 2012 16:45:04 -0400 Subject: Drupal 7.16. --- includes/install.core.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'includes/install.core.inc') diff --git a/includes/install.core.inc b/includes/install.core.inc index ec3a8539b..7bcd026ae 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -295,12 +295,11 @@ function install_begin_request(&$install_state) { else { $task = NULL; - // Since previous versions of Drupal stored database connection information - // in the 'db_url' variable, we should never let an installation proceed if - // this variable is defined and the settings file was not verified above - // (otherwise we risk installing over an existing site whose settings file - // has not yet been updated). - if (!empty($GLOBALS['db_url'])) { + // 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'])) { throw new Exception(install_already_done_error()); } } -- cgit v1.2.3