diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-06-22 14:10:34 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-03-05 11:52:22 +0100 |
| commit | 6df35c2cb6895fedee6a85645b369bff52c25670 (patch) | |
| tree | 31038943e7f89f42a159dd8ec09e6b6aa20b4210 /phpBB/includes/utf/utf_tools.php | |
| parent | 66c116f7deb7adcd8928026aeceb536c72f5e86c (diff) | |
| download | forums-6df35c2cb6895fedee6a85645b369bff52c25670.tar forums-6df35c2cb6895fedee6a85645b369bff52c25670.tar.gz forums-6df35c2cb6895fedee6a85645b369bff52c25670.tar.bz2 forums-6df35c2cb6895fedee6a85645b369bff52c25670.tar.xz forums-6df35c2cb6895fedee6a85645b369bff52c25670.zip | |
[ticket/9669] Make sure normalize_nfc returns string
Normalizer::normalize can return null, cast to a string.
PHPBB3-9669
Diffstat (limited to 'phpBB/includes/utf/utf_tools.php')
| -rw-r--r-- | phpBB/includes/utf/utf_tools.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 4cc0486e91..34f9633677 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -1782,7 +1782,7 @@ else { return $strings; } - return Normalizer::normalize($strings); + return (string) Normalizer::normalize($strings); } else { @@ -1796,7 +1796,7 @@ else { continue; } - $strings[$key][$_key] = Normalizer::normalize($strings[$key][$_key]); + $strings[$key][$_key] = (string) Normalizer::normalize($strings[$key][$_key]); } } else @@ -1805,7 +1805,7 @@ else { continue; } - $strings[$key] = Normalizer::normalize($strings[$key]); + $strings[$key] = (string) Normalizer::normalize($strings[$key]); } } } |