Commit fe2e11a2 authored by catch's avatar catch

Issue #2159501 by sun: Remove DRUPAL_BOOTSTRAP_DATABASE.

parent 60659cd6
...@@ -138,24 +138,19 @@ ...@@ -138,24 +138,19 @@
const DRUPAL_BOOTSTRAP_PAGE_CACHE = 2; const DRUPAL_BOOTSTRAP_PAGE_CACHE = 2;
/** /**
* Fourth bootstrap phase: initialize database layer. * Fourth bootstrap phase: initialize the variable system.
*/ */
const DRUPAL_BOOTSTRAP_DATABASE = 3; const DRUPAL_BOOTSTRAP_VARIABLES = 3;
/** /**
* Fifth bootstrap phase: initialize the variable system. * Fifth bootstrap phase: load code for subsystems and modules.
*/ */
const DRUPAL_BOOTSTRAP_VARIABLES = 4; const DRUPAL_BOOTSTRAP_CODE = 4;
/**
* Sixth bootstrap phase: load code for subsystems and modules.
*/
const DRUPAL_BOOTSTRAP_CODE = 5;
/** /**
* Final bootstrap phase: initialize language, path, theme, and modules. * Final bootstrap phase: initialize language, path, theme, and modules.
*/ */
const DRUPAL_BOOTSTRAP_FULL = 6; const DRUPAL_BOOTSTRAP_FULL = 5;
/** /**
* Role ID for anonymous users; should match what's in the "role" table. * Role ID for anonymous users; should match what's in the "role" table.
...@@ -1748,7 +1743,6 @@ function drupal_anonymous_user() { ...@@ -1748,7 +1743,6 @@ function drupal_anonymous_user() {
* - DRUPAL_BOOTSTRAP_CONFIGURATION: Initializes configuration. * - DRUPAL_BOOTSTRAP_CONFIGURATION: Initializes configuration.
* - DRUPAL_BOOTSTRAP_KERNEL: Initalizes a kernel. * - DRUPAL_BOOTSTRAP_KERNEL: Initalizes a kernel.
* - DRUPAL_BOOTSTRAP_PAGE_CACHE: Tries to serve a cached page. * - DRUPAL_BOOTSTRAP_PAGE_CACHE: Tries to serve a cached page.
* - DRUPAL_BOOTSTRAP_DATABASE: Initializes the database layer.
* - DRUPAL_BOOTSTRAP_VARIABLES: Initializes the variable system. * - DRUPAL_BOOTSTRAP_VARIABLES: Initializes the variable system.
* - DRUPAL_BOOTSTRAP_CODE: Loads code for subsystems and modules. * - DRUPAL_BOOTSTRAP_CODE: Loads code for subsystems and modules.
* - DRUPAL_BOOTSTRAP_FULL: Fully loads Drupal. Validates and fixes input * - DRUPAL_BOOTSTRAP_FULL: Fully loads Drupal. Validates and fixes input
...@@ -1766,7 +1760,6 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { ...@@ -1766,7 +1760,6 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) {
DRUPAL_BOOTSTRAP_CONFIGURATION, DRUPAL_BOOTSTRAP_CONFIGURATION,
DRUPAL_BOOTSTRAP_KERNEL, DRUPAL_BOOTSTRAP_KERNEL,
DRUPAL_BOOTSTRAP_PAGE_CACHE, DRUPAL_BOOTSTRAP_PAGE_CACHE,
DRUPAL_BOOTSTRAP_DATABASE,
DRUPAL_BOOTSTRAP_VARIABLES, DRUPAL_BOOTSTRAP_VARIABLES,
DRUPAL_BOOTSTRAP_CODE, DRUPAL_BOOTSTRAP_CODE,
DRUPAL_BOOTSTRAP_FULL, DRUPAL_BOOTSTRAP_FULL,
...@@ -1809,10 +1802,6 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { ...@@ -1809,10 +1802,6 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) {
_drupal_bootstrap_page_cache(); _drupal_bootstrap_page_cache();
break; break;
case DRUPAL_BOOTSTRAP_DATABASE:
_drupal_bootstrap_database();
break;
case DRUPAL_BOOTSTRAP_VARIABLES: case DRUPAL_BOOTSTRAP_VARIABLES:
_drupal_bootstrap_variables(); _drupal_bootstrap_variables();
break; break;
...@@ -2015,6 +2004,7 @@ function _drupal_bootstrap_page_cache() { ...@@ -2015,6 +2004,7 @@ function _drupal_bootstrap_page_cache() {
global $user; global $user;
require_once __DIR__ . '/cache.inc'; require_once __DIR__ . '/cache.inc';
require_once __DIR__ . '/database.inc';
// Check for a cache mode force from settings.php. // Check for a cache mode force from settings.php.
if (settings()->get('page_cache_without_database')) { if (settings()->get('page_cache_without_database')) {
$cache_enabled = TRUE; $cache_enabled = TRUE;
...@@ -2088,15 +2078,6 @@ function _drupal_initialize_db_test_prefix() { ...@@ -2088,15 +2078,6 @@ function _drupal_initialize_db_test_prefix() {
} }
} }
/**
* Initializes the database system by loading database.inc.
*/
function _drupal_bootstrap_database() {
// Initialize the database system. Note that the connection
// won't be initialized until it is actually requested.
require_once __DIR__ . '/database.inc';
}
/** /**
* Loads system variables and all enabled bootstrap modules. * Loads system variables and all enabled bootstrap modules.
*/ */
......
...@@ -91,7 +91,6 @@ function drupal_theme_initialize() { ...@@ -91,7 +91,6 @@ function drupal_theme_initialize() {
return; return;
} }
drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE);
$themes = list_themes(); $themes = list_themes();
// @todo Let the theme.negotiator listen to the kernel request event. // @todo Let the theme.negotiator listen to the kernel request event.
......
...@@ -142,7 +142,7 @@ function update_prepare_d8_bootstrap() { ...@@ -142,7 +142,7 @@ function update_prepare_d8_bootstrap() {
} }
// Bootstrap the database. // Bootstrap the database.
drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); require_once __DIR__ . '/database.inc';
// module.inc is not yet loaded but there are calls to module_config_sort() // module.inc is not yet loaded but there are calls to module_config_sort()
// below. // below.
......
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