diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-17 06:46:48 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-17 06:46:48 -0800 |
| commit | 74472dc83ca897423c630dce0d1d7e3b13bb0b5f (patch) | |
| tree | 4cac66304fcc8346ad238d2cda123160b65f3eb3 /modules/gallery/libraries | |
| parent | eb1cdd037646b3697b64753652669fa9e25a5c8e (diff) | |
| parent | 4ca55a90ee2f8e1d8595b0ec53a601d6c65475f6 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/libraries')
| -rw-r--r-- | modules/gallery/libraries/Gallery_I18n.php | 3 |
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); |