diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index d535a0f..287a104 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -254,11 +254,10 @@ function locale($string = NULL, $context = NULL, $langcode = NULL) { // Use the advanced drupal_static() pattern, since this is called very often. static $drupal_static_fast; if (!isset($drupal_static_fast)) { - $drupal_static_fast['cache'] = &drupal_static(__FUNCTION__ . ':cache'); - $drupal_static_fast['exists'] = &drupal_static(__FUNCTION__ . ':exists'); + $drupal_static_fast['locale'] = &drupal_static(__FUNCTION__, array('cache' => array(), 'exists' => NULL)); } - $locale_t = &$drupal_static_fast['cache']; - $locale_exists = &$drupal_static_fast['exists']; + $locale_t = &$drupal_static_fast['locale']['cache']; + $locale_exists = &$drupal_static_fast['locale']['exists']; // Check whether Locale module is actually installed and operational. // The mere existence of locale() does not imply that Locale module is