Fix UTF-8 encoding before JSON export

2 files changed, 22 insertions, 1 deletions

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 400857b4..1476d158 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -908,7 +908,7 @@ class Poche
         $entries = $this->store->retrieveAllWithTags($this->user->getId());
         if ($entries) {
             echo $this->tpl->render('export.twig', array(
-            'export' => Tools::renderJson($entries),
+            'export' => Tools::renderJson(Tools::utf8ize($entries)),
             ));
             Tools::logm('export view');
         } else {
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index e5e150cd..d84850cf 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -233,6 +233,27 @@ final class Tools
     }
 
     /**
+     * UTF-8 encode array of string
+     *
+     * @param $data
+     */
+    public static function utf8ize($data) 
+    {
+       if (is_array($data)) 
+        {
+            foreach ($data as $k => $v) 
+            {
+                $data[$k] = self::utf8ize($v);
+            }
+        }
+        else if (is_string ($data)) 
+        {
+            return utf8_encode($data);
+        }
+        return $data;
+    }
+
+    /**
      * Create new line in log file
      *
      * @param $message