Commit d6514fe3 authored by webchick's avatar webchick

#340500 by justinrandell: Fix silliness in install.inc that was loading the db...

#340500 by justinrandell: Fix silliness in install.inc that was loading the db system twice for no apparent reason.
parent 466e5726
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment