Apply utf8_encode only on unrecognized encoded string

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 3f68cff5e36a23efc446471ca8928944a1ad754b..2ee86c74e7ccb5823bfd4663454ba3ca90f8eab0 100755 (executable)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -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;
     }