From 435c939f59ed52d67f36cd893d0e202a1a0d1234 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 9 May 2009 18:39:03 +0000
Subject: - Patch #407256 by Damien Tournoud: make t() more robust.

---
 includes/common.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'includes/common.inc')

diff --git a/includes/common.inc b/includes/common.inc
index 76637a4c7..a292c30cc 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1122,7 +1122,10 @@ function t($string, $args = array(), $langcode = NULL) {
     $string = $custom_strings[$langcode][$string];
   }
   // Translate with locale module if enabled.
-  elseif (function_exists('locale') && $langcode != 'en') {
+  // 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') && $langcode != 'en') {
     $string = locale($string, $langcode);
   }
   if (empty($args)) {
-- 
cgit v1.2.3