Fix for ticket #1017: Handle the common case of t(html::clean($var)) by casting SafeString instances to string in translate().

1 files changed, 3 insertions, 0 deletions

diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index cfed046a..160543c9 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -117,6 +117,9 @@ class Gallery_I18n_Core {
     $count = isset($options['count']) ? $options['count'] : null;
     $values = $options;
     unset($values['locale']);
+    if ($message instanceof SafeString) {
+      $message = (string) $message;
+    }
     $this->log($message, $options);
 
     $entry = $this->lookup($locale, $message);