summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngie Byron2008-11-30 01:11:23 (GMT)
committerAngie Byron2008-11-30 01:11:23 (GMT)
commitd6514fe3aa6aeed7493824395a8d50632785865f (patch)
tree5b5cf918c1e64fe00ab9609fb886f8b3a0559753
parent466e5726850bd3e7aab1189ebd1d95a71b9b3458 (diff)
#340500 by justinrandell: Fix silliness in install.inc that was loading the db system twice for no apparent reason.
-rw-r--r--includes/install.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/install.inc b/includes/install.inc
index 8902d34..b17d563 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -554,6 +554,7 @@ function drupal_install_init_database() {
foreach (glob(DRUPAL_ROOT . '/includes/database/' . $driver . '/*.inc') as $include_file) {
require_once $include_file;
}
+ $included = TRUE;
}
}
@@ -573,7 +574,6 @@ function drupal_install_system() {
$system_version = $system_versions ? max($system_versions) : SCHEMA_INSTALLED;
db_query("INSERT INTO {system} (filename, name, type, owner, status, schema_version) VALUES('%s', '%s', '%s', '%s', %d, %d)", $system_path . '/system.module', 'system', 'module', '', 1, $system_version);
// Now that we've installed things properly, bootstrap the full Drupal environment
- drupal_install_init_database();
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
module_rebuild_cache();
}