mirror of
https://github.com/wallabag/wallabag.git
synced 2024-05-31 15:38:04 +00:00
Apply utf8_encode only on unrecognized encoded string
This commit is contained in:
parent
ccf59ac4ff
commit
7672a10776
|
@ -237,18 +237,25 @@ final class Tools
|
|||
*
|
||||
* @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);
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue