[eGroupWare-svn] r24921 - /trunk/phpgwapi/inc/class.translation.inc.php

[<lei...@us...>]

Author: leithoff
Date: Thu Jan 31 13:31:18 2008
New Revision: 24921

URL: http://www.egroupware.org/viewvc?rev=3D3D24921&view=3D3Drev
Log:
prevent the mb_convert_encoding to return with an empty string, for the fai=
=3D
ling of the conversion in that function results in an empty string as =3D

well. =3D


Modified:
    trunk/phpgwapi/inc/class.translation.inc.php

Modified: trunk/phpgwapi/inc/class.translation.inc.php
URL: http://www.egroupware.org/viewvc/trunk/phpgwapi/inc/class.translation.=
=3D
inc.php?rev=3D3D24921&r1=3D3D24920&r2=3D3D24921&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/phpgwapi/inc/class.translation.inc.php (original)
+++ trunk/phpgwapi/inc/class.translation.inc.php Thu Jan 31 13:31:18 2008
@@ -463,7 +463,7 @@
 			{
 				return utf8_decode($data);
 			}
-			if ($this->mbstring)
+			if ($this->mbstring && mb_convert_encoding($data,$to,$from)!=3D3D"")
 			{
 				return @mb_convert_encoding($data,$to,$from);
 			}