Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.206.2.9 diff -u -F^function -r1.206.2.9 bootstrap.inc --- includes/bootstrap.inc 14 Jan 2009 19:10:25 -0000 1.206.2.9 +++ includes/bootstrap.inc 21 Jan 2009 02:17:20 -0000 @@ -76,15 +76,15 @@ define('DRUPAL_BOOTSTRAP_SESSION', 4); /** - * Sixth bootstrap phase: load bootstrap.inc and module.inc, start - * the variable system and try to serve a page from the cache. + * Sixth bootstrap phase: find out language of the page. */ -define('DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE', 5); +define('DRUPAL_BOOTSTRAP_LANGUAGE', 5); /** - * Seventh bootstrap phase: find out language of the page. + * Seventh bootstrap phase: load bootstrap.inc and module.inc, start + * the variable system and try to serve a page from the cache. */ -define('DRUPAL_BOOTSTRAP_LANGUAGE', 6); +define('DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE', 6); /** * Eighth bootstrap phase: set $_GET['q'] to Drupal path of request. @@ -956,14 +956,14 @@ function drupal_anonymous_user($session * DRUPAL_BOOTSTRAP_DATABASE: initialize database layer. * DRUPAL_BOOTSTRAP_ACCESS: identify and reject banned hosts. * DRUPAL_BOOTSTRAP_SESSION: initialize session handling. + * DRUPAL_BOOTSTRAP_LANGUAGE: identify the language used on the page. * DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE: load bootstrap.inc and module.inc, start * the variable system and try to serve a page from the cache. - * DRUPAL_BOOTSTRAP_LANGUAGE: identify the language used on the page. * DRUPAL_BOOTSTRAP_PATH: set $_GET['q'] to Drupal path of request. * DRUPAL_BOOTSTRAP_FULL: Drupal is fully loaded, validate and fix input data. */ function drupal_bootstrap($phase) { - static $phases = array(DRUPAL_BOOTSTRAP_CONFIGURATION, DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE, DRUPAL_BOOTSTRAP_DATABASE, DRUPAL_BOOTSTRAP_ACCESS, DRUPAL_BOOTSTRAP_SESSION, DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE, DRUPAL_BOOTSTRAP_LANGUAGE, DRUPAL_BOOTSTRAP_PATH, DRUPAL_BOOTSTRAP_FULL), $phase_index = 0; + static $phases = array(DRUPAL_BOOTSTRAP_CONFIGURATION, DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE, DRUPAL_BOOTSTRAP_DATABASE, DRUPAL_BOOTSTRAP_ACCESS, DRUPAL_BOOTSTRAP_SESSION, DRUPAL_BOOTSTRAP_LANGUAGE, DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE, DRUPAL_BOOTSTRAP_PATH, DRUPAL_BOOTSTRAP_FULL), $phase_index = 0; while ($phase >= $phase_index && isset($phases[$phase_index])) { $current_phase = $phases[$phase_index]; @@ -973,7 +973,7 @@ function drupal_bootstrap($phase) { } function _drupal_bootstrap($phase) { - global $conf; + global $conf, $language, $language_redirect; switch ($phase) { @@ -1019,18 +1019,33 @@ function _drupal_bootstrap($phase) { session_start(); break; - case DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE: + case DRUPAL_BOOTSTRAP_LANGUAGE: // Initialize configuration variables, using values from settings.php if available. $conf = variable_init(isset($conf) ? $conf : array()); + drupal_init_language(); + break; + + case DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE: $cache_mode = variable_get('cache', CACHE_DISABLED); - // Get the page from the cache. - $cache = $cache_mode == CACHE_DISABLED ? '' : page_get_cache(); // If the skipping of the bootstrap hooks is not enforced, call hook_boot. - if (!$cache || $cache_mode != CACHE_AGGRESSIVE) { + if ($cache_mode != CACHE_AGGRESSIVE) { // Load module handling. require_once './includes/module.inc'; bootstrap_invoke_all('boot'); } + // If the language has been reset from the default, redirect + // to the new language. + if ($language_redirect && (($default_language = language_default()) != $language)) { + // Load modules required for hook_exit. + bootstrap_invoke_all('exit'); + // We need the path system. + drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH); + require_once './includes/common.inc'; + $path = drupal_get_normal_path($_GET['q'], $default_language->language); + drupal_goto($path); + } + // Fetch the page from the cache. + $cache = $cache_mode == CACHE_DISABLED ? '' : page_get_cache(); // If there is a cached page, display it. if ($cache) { drupal_page_cache_header($cache); @@ -1041,14 +1056,16 @@ function _drupal_bootstrap($phase) { // We are done. exit; } + // If not skipped above, call hook_boot now. + if ($cache_mode == CACHE_AGGRESSIVE) { + require_once './includes/module.inc'; + bootstrap_invoke_all('boot'); + } + // Prepare for non-cached page workflow. drupal_page_header(); break; - case DRUPAL_BOOTSTRAP_LANGUAGE: - drupal_init_language(); - break; - case DRUPAL_BOOTSTRAP_PATH: require_once './includes/path.inc'; // Initialize $_GET['q'] prior to loading modules and invoking hook_init(). @@ -1091,7 +1108,7 @@ function get_t() { * Choose a language for the current page, based on site and user preferences. */ function drupal_init_language() { - global $language, $user; + global $language; // Ensure the language is correctly returned, even without multilanguage support. // Useful for eg. XML/HTML 'lang' attributes. Index: includes/language.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/language.inc,v retrieving revision 1.14.2.1 diff -u -F^function -r1.14.2.1 language.inc --- includes/language.inc 2 Jan 2009 23:37:48 -0000 1.14.2.1 +++ includes/language.inc 21 Jan 2009 02:17:29 -0000 @@ -7,10 +7,10 @@ */ /** - * Choose a language for the page, based on language negotiation settings. + * Choose a language for the page, based on language negotiation settings. */ function language_initialize() { - global $user; + global $user, $language_redirect; // Configured presentation language mode. $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE); @@ -52,13 +52,19 @@ function language_initialize() { break; } + // We should reach this point only if LANGUAGE_NEGOTIATION_PATH is set + // but no valid prefix was found or if some custom value has been set for + // language_negotiation. + // User language. if ($user->uid && isset($languages[$user->language])) { + $language_redirect = TRUE; return $languages[$user->language]; } // Browser accept-language parsing. if ($language = language_from_browser()) { + $language_redirect = TRUE; return $language; }