makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
Show stats 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 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]);
}
}
}