2 commits - lib/kolab_api_service.php

[Aleksander Machniak]

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

New commits:
commit 88a03514e019252a4de87d9cbf00376666fb6c8b
Merge: 6ff0309 dc17598
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Wed Mar 14 20:09:35 2012 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit 6ff0309570d7465e2cc8dc6520c18c0355b6f739
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Wed Mar 14 20:08:31 2012 +0100

    From now attributes in DB aren't serialized

diff --git a/lib/kolab_api_service.php b/lib/kolab_api_service.php
index 1dcd2a0..60e9ced 100644
--- a/lib/kolab_api_service.php
+++ b/lib/kolab_api_service.php
@@ -168,7 +168,7 @@ abstract class kolab_api_service
             foreach ($row as $key => $value) {
                 if ($key != "id") {
                     if ($key == "attributes") {
-                        $user_types[$row['id']][$key] = json_decode(unserialize($value), true);
+                        $user_types[$row['id']][$key] = json_decode($value, true);
                     }
                     else {
                         $user_types[$row['id']][$key] = $value;
@@ -200,7 +200,7 @@ abstract class kolab_api_service
             foreach ($row as $key => $value) {
                 if ($key != "id") {
                     if ($key == "attributes") {
-                        $group_types[$row['id']][$key] = json_decode(unserialize($value), true);
+                        $group_types[$row['id']][$key] = json_decode($value, true);
                     }
                     else {
                         $group_types[$row['id']][$key] = $value;