Factorize

[github/wallabag/wallabag.git] / inc / poche / Tools.class.php

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 2ee86c74e7ccb5823bfd4663454ba3ca90f8eab0..263034f07d3363e5df1b23781dae68a46d5736b3 100755 (executable)
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -239,23 +239,16 @@ final class Tools
      */
     public static function utf8ize($data)
     {
-       if (is_array($data))
+        if (is_array($data))
         {
             foreach ($data as $k => $v)
             {
                 $data[$k] = self::utf8ize($v);
             }
         }
-        else if (is_string ($data))
+        else if (is_string ($data) && '' == mb_detect_encoding($data))
         {
-            if ('' == mb_detect_encoding($data))
-            {
-                return utf8_encode($data);
-            }
-            else
-            {
-                return $data;
-            }
+            return utf8_encode($data);
         }
         return $data;
     }