mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-20 18:08:02 +02:00
prevent the mb_convert_encoding to return with an empty string, for the failing of the conversion in that function results in an empty string as
well.
This commit is contained in:
parent
a0cee847a2
commit
08e5fa0497
@ -463,7 +463,7 @@
|
|||||||
{
|
{
|
||||||
return utf8_decode($data);
|
return utf8_decode($data);
|
||||||
}
|
}
|
||||||
if ($this->mbstring)
|
if ($this->mbstring && mb_convert_encoding($data,$to,$from)!="")
|
||||||
{
|
{
|
||||||
return @mb_convert_encoding($data,$to,$from);
|
return @mb_convert_encoding($data,$to,$from);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user