? 1
? HEAD.png
? _menu_link_translate.png
? attributes.patch
? bottle.patch
? check_plain.patch
? damz.patch
? damz.png
? drupal.schema-versions.patch
? drupal_function_exists.patch
? empty.patch
? head.png
? hook_page_not_found.patch
? ie6diediedieyoufucker.patch
? implode.png
? option1.png
? option2.png
? patch.png
? path_lookup.patch
? preg_grep.patch
? preg_grep.png
? preg_schema.patch
? remove_access.patch
? schema_versions.patch
? search_index_content_5.patch
? system_admin_menu_block.patch
? system_admin_menu_block.patch.1
? t.patch
? theme.patch
? url.patch
? sites/default/files
? sites/default/settings.php
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.935
diff -u -p -r1.935 common.inc
--- includes/common.inc	15 Jul 2009 17:40:17 -0000	1.935
+++ includes/common.inc	18 Jul 2009 21:33:01 -0000
@@ -1138,6 +1138,10 @@ function fix_gpc_magic() {
  */
 function t($string, array $args = array(), array $options = array()) {
   global $language;
+  static  $locale;
+  if (!isset($locale)) {
+    $locale = module_exists('locale');
+  }
   $custom_strings = &drupal_static(__FUNCTION__);
 
   // Merge in default.
@@ -1163,7 +1167,7 @@ function t($string, array $args = array(
   // We don't use drupal_function_exists() here, because it breaks the testing
   // framework if the locale module is enabled in the parent site (we cannot
   // unload functions in PHP).
-  elseif (module_exists('locale') && $options['langcode'] != 'en') {
+  elseif ($locale && $options['langcode'] != 'en') {
     $string = locale($string, $options['context'], $options['langcode']);
   }
   if (empty($args)) {