summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries/SafeString.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2012-05-16 11:32:28 -0700
committerBharat Mediratta <bharat@menalto.com>2012-05-16 11:32:28 -0700
commit1c5c2e7de42f9e59932c81fb26c8416b2fef3fda (patch)
tree2371879ee914dfa158217597781932dcbc60f756 /modules/gallery/libraries/SafeString.php
parent91e87cb811769dc9490549ca4c01a3830ee6da37 (diff)
Convert any UTF-7 to UTF-8 so that fragment pages (like AJAX replies)
won't be mistakenly interpreted as UTF-7. Fixes #1869.
Diffstat (limited to 'modules/gallery/libraries/SafeString.php')
-rw-r--r--modules/gallery/libraries/SafeString.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/libraries/SafeString.php b/modules/gallery/libraries/SafeString.php
index 997abd2e..52ed48f2 100644
--- a/modules/gallery/libraries/SafeString.php
+++ b/modules/gallery/libraries/SafeString.php
@@ -31,7 +31,7 @@ class SafeString_Core {
$this->_is_safe_html = $string->_is_safe_html;
$string = $string->unescaped();
}
- $this->_raw_string = (string) $string;
+ $this->_raw_string = mb_convert_encoding((string) $string, 'UTF-8', 'UTF-7');
}
/**