From c8da8e39ef9eae3662f89192d62d2aadb29e671c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 26 Oct 2010 07:42:33 +0000 Subject: [PATCH] fixed bug introduce in fix: no more serialized cat data (like calendar colors) were returned --- phpgwapi/inc/class.categories.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php index 4e43996ff0..e9ffac8a9f 100644 --- a/phpgwapi/inc/class.categories.inc.php +++ b/phpgwapi/inc/class.categories.inc.php @@ -394,9 +394,9 @@ class categories if (!isset(self::$cache[$id])) return false; $cat = self::$cache[$id]; - $cat['data'] = $cat['data'] ? (($arr=unserialize($cat['data']) !== false && $cat['data'] !== 'b:0;') ? + $cat['data'] = $cat['data'] ? ((($arr=unserialize($cat['data'])) !== false || $cat['data'] === 'b:0;') ? $arr : $cat['data']) : array(); - + return $cat; }