- Patch #642782 by plach, Dave Reid, greggles, mfb: hook_language_init() is a bootstrap hook and needs bootstrap_invoke_all().

1 files changed, 4 insertions, 4 deletions

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index ebb476f8d..d2c739aab 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -859,10 +859,10 @@ function drupal_page_is_cacheable($allow_caching = NULL) {
 }
 
 /**
- * Call all init or exit hooks without including all modules.
+ * Invoke a bootstrap hook in all bootstrap modules that implement it.
  *
  * @param $hook
- *   The name of the bootstrap hook we wish to invoke.
+ *   The name of the bootstrap hook to invoke.
  */
 function bootstrap_invoke_all($hook) {
   // _drupal_bootstrap_page_cache() already loaded the bootstrap modules, so we
@@ -1163,7 +1163,7 @@ function drupal_serve_page_from_cache(stdClass $cache) {
  * Define the critical hooks that force modules to always be loaded.
  */
 function bootstrap_hooks() {
-  return array('boot', 'exit', 'watchdog');
+  return array('boot', 'exit', 'watchdog', 'language_init');
 }
 
 /**
@@ -2086,7 +2086,7 @@ function drupal_language_initialize() {
     }
     // Allow modules to react on language system initialization in multilingual
     // environments.
-    module_invoke_all('language_init', $types);
+    bootstrap_invoke_all('language_init');
   }
 }