oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Apply utf8_encode only on unrecognized encoded string

Browse source
This commit is contained in:
Ymage 2016-04-07 22:35:37 +02:00
parent ccf59ac4ff
commit 7672a10776
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
inc/poche/Tools.class.php
View file

@ -237,18 +237,25 @@ final class Tools
* *
* @param $data * @param $data
*/ */
public static function utf8ize($data) public static function utf8ize($data)
{ {
if (is_array($data)) if (is_array($data))
{ {
foreach ($data as $k => $v) foreach ($data as $k => $v)
{ {
$data[$k] = self::utf8ize($v); $data[$k] = self::utf8ize($v);
} }
} }
else if (is_string ($data)) else if (is_string ($data))
{ {
return utf8_encode($data); if ('' == mb_detect_encoding($data))
{
return utf8_encode($data);
}
else
{
return $data;
}
} }
return $data; return $data;
} }