From 9514ef0df569ac0fdc8b62668c7624cca2b47b43 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Thu, 4 Sep 2014 13:06:30 +0200
Subject: [PATCH] User api: Fixes returned group names.

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

diff --git a/api/user.php b/api/user.php
index 0e9dbf5..9721f8b 100644
--- a/api/user.php
+++ b/api/user.php
@@ -149,7 +149,7 @@ $ids = implode(",", $id_array);
 $conn->setFetchMode(DB_FETCHMODE_ASSOC);
 /* Get data */
 $sql_is_member = "u.expires > NOW() OR u.expires IS NULL AS is_member";
-$sql_groups = "GROUP_CONCAT(DISTINCT g.id,'-',g.name SEPARATOR ',') AS groups";
+$sql_groups = "GROUP_CONCAT(DISTINCT g.id,';',g.name SEPARATOR ',') AS groups";
 $data_sql = "SELECT u.id,u.username,u.firstname,u.lastname,u.email,up.number,$sql_groups,$sql_is_member
     FROM din_user as u
     LEFT JOIN din_userphonenumber as up ON up.user_id=u.id
@@ -177,7 +177,7 @@ foreach($res as $result) {
             $u_gs = array();
             $u_groups = explode(",",$value);
             foreach($u_groups as $g) {
-                list($id,$name) = explode("-", $g);
+                list($id,$name) = explode(";", $g);
                 if( !is_valid_utf8($name) ) {
                     $name = utf8_encode($name);
                 }