Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.256 diff -u -p -r1.256 locale.module --- modules/locale/locale.module 24 Aug 2009 00:14:20 -0000 1.256 +++ modules/locale/locale.module 26 Aug 2009 10:33:02 -0000 @@ -379,7 +379,7 @@ function locale($string = NULL, $context $langcode = isset($langcode) ? $langcode : $language->language; // Store database cached translations in a static var. - if (!isset($locale_t[$langcode])) { + if (!isset($locale_t[$langcode]) && isset($language)) { $locale_t[$langcode] = array(); // Disabling the usage of string caching allows a module to watch for // the exact list of strings used on a page. From a performance