From 4fdeb68d24e7ee421180a248730070cc84e3ecbe Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Mon, 18 Aug 2014 13:46:09 +0200
Subject: [PATCH] Encoding fix

---
 api/user.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/user.php b/api/user.php
index 421f9d8..0e9dbf5 100644
--- a/api/user.php
+++ b/api/user.php
@@ -178,15 +178,19 @@ foreach($res as $result) {
             $u_groups = explode(",",$value);
             foreach($u_groups as $g) {
                 list($id,$name) = explode("-", $g);
+                if( !is_valid_utf8($name) ) {
+                    $name = utf8_encode($name);
+                }
+
                 $u_gs[] = array(
                     'id' => $id,
-                    'name' => utf8_encode($name)
+                    'name' => $name
                 );
             }
             $result[$key] = $u_gs;
         }
         /* Encoding issues? oh yes, utf-8 please */
-        elseif(!is_valid_utf8($value)) {
+        elseif( !is_valid_utf8($value) ) {
             $result[$key] = utf8_encode($value);
         }
     }