- Patch #325169 by mundanity, Arancaytar, Crell, chx, picco, alexw: move error/exception handler higher up in the bootstrap process.

1 files changed, 6 insertions, 2 deletions

diff --git a/includes/theme.inc b/includes/theme.inc
index 7668ab9e4..d8bec3403 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -2543,6 +2543,10 @@ function template_preprocess_maintenance_page(&$variables) {
       $head_title[] = variable_get('site_slogan', '');
     }
   }
+
+  // set the default language if necessary
+  $language = isset($GLOBALS['language']) ? $GLOBALS['language'] : language_default();
+
   $variables['head_title']        = implode(' | ', $head_title);
   $variables['base_path']         = base_path();
   $variables['front_page']        = url();
@@ -2550,8 +2554,8 @@ function template_preprocess_maintenance_page(&$variables) {
   $variables['feed_icons']        = '';
   $variables['head']              = drupal_get_html_head();
   $variables['help']              = '';
-  $variables['language']          = $GLOBALS['language'];
-  $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
+  $variables['language']          = $language;
+  $variables['language']->dir     = $language->direction ? 'rtl' : 'ltr';
   $variables['logo']              = theme_get_setting('logo');
   $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
   $variables['main_menu']         = array();