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 14:53:20.255982900 +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/modules/locale.module drupal/modules/locale.module
--- drupal-4.7.1/modules/locale.module	2006-03-17 19:35:56.000000000 +0100
+++ drupal/modules/locale.module	2006-05-27 14:53:27.911987900 +0200
@@ -176,6 +176,10 @@ function locale($string) {
 
   // Store database cached translations in a static var.
   if (!isset($locale_t)) {
+    if (!isset($locale)) {
+      // Initialize the localization system.
+      $locale = locale_initialize();
+    }
     $cache = cache_get("locale:$locale");
 
     if ($cache == 0) {
