summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngie Byron2010-09-11 06:24:55 (GMT)
committerAngie Byron2010-09-11 06:24:55 (GMT)
commit452e31f62924d35b71576aa8291812014a80561e (patch)
tree4144193dccace1e81a5c45c9dd0150511f5ca17c
parentb06d19e34957bd3e719dfcff9e6d180ea95330e5 (diff)
#818418 by Amitaibu: Fixed Notices on language negotiation callback when trying to force a full bootstrap.
-rw-r--r--includes/bootstrap.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index c41b67b..c4d52e2 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -2327,15 +2327,15 @@ function get_t() {
function drupal_language_initialize() {
$types = language_types();
- // Ensure the language is correctly returned, even without multilanguage support.
+ // Ensure the language is correctly returned, even without multilanguage
+ // support. Also make sure we have a $language fallback, in case a language
+ // negotiation callback needs to do a full bootstrap.
// Useful for eg. XML/HTML 'lang' attributes.
- if (!drupal_multilingual()) {
- $default = language_default();
- foreach ($types as $type) {
- $GLOBALS[$type] = $default;
- }
+ $default = language_default();
+ foreach ($types as $type) {
+ $GLOBALS[$type] = $default;
}
- else {
+ if (drupal_multilingual()) {
include_once DRUPAL_ROOT . '/includes/language.inc';
foreach ($types as $type) {
$GLOBALS[$type] = language_initialize($type);