diff -wur -F'^f' drupal-4.7.1/includes/common.inc drupal/includes/common.inc --- drupal-4.7.1/includes/common.inc 2006-05-15 22:53:26.000000000 +0200 +++ drupal/includes/common.inc 2006-05-27 11:16:52.969432800 +0200 @@ -1321,7 +1321,6 @@ function xmlrpc($url) { function _drupal_bootstrap_full() { static $called; - global $locale; if ($called) { return; @@ -1345,8 +1344,6 @@ function _drupal_bootstrap_full() { module_init(); // Undo magic quotes fix_gpc_magic(); - // Initialize the localization system. - $locale = locale_initialize(); } /** diff -wur -F'^f' drupal-4.7.1/includes/module.inc drupal/includes/module.inc --- drupal-4.7.1/includes/module.inc 2006-02-27 16:04:46.000000000 +0100 +++ drupal/includes/module.inc 2006-05-27 11:16:31.391998300 +0200 @@ -10,10 +10,14 @@ * Initialize all modules. */ function module_init() { + global $locale; + // Load all the modules that have been enabled in the system table. foreach (module_list(TRUE, FALSE) as $module) { drupal_load('module', $module); } + // Initialize the localization system. + $locale = locale_initialize(); module_invoke_all('init'); }