mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/9669] Make sure normalize_nfc returns string

Browse Source 
Normalizer::normalize can return null, cast to a string.

PHPBB3-9669
This commit is contained in:
Igor Wiedler
2010-06-22 14:10:34 +02:00
parent 66c116f7de
commit 6df35c2cb6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/utf/utf_tools.php
View File

@@ -1782,7 +1782,7 @@ else
{ {
return $strings; return $strings;
} }
return Normalizer::normalize($strings); return (string) Normalizer::normalize($strings);
} }
else else
{ {
@@ -1796,7 +1796,7 @@ else
{ {
continue; continue;
} }
$strings[$key][$_key] = Normalizer::normalize($strings[$key][$_key]); $strings[$key][$_key] = (string) Normalizer::normalize($strings[$key][$_key]);
} }
} }
else else
@@ -1805,7 +1805,7 @@ else
{ {
continue; continue;
} }
$strings[$key] = Normalizer::normalize($strings[$key]); $strings[$key] = (string) Normalizer::normalize($strings[$key]);
} }
} }
} }