Commit 435c939f authored by Dries's avatar Dries

- Patch #407256 by Damien Tournoud: make t() more robust.

parent bbe7b774
......@@ -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)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment