diff options
| -rw-r--r-- | includes/bootstrap.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index c41b67bde..c4d52e27c 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); |