From e07b0fdfecbf861c29df4064d4ff1945de5be7e2 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 6 Jan 2011 08:33:52 +0100
Subject: [PATCH] Ensure we store serialized data in the cache.

---
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/List.php       | 4 ++--
 .../test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php       | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/List.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/List.php
index 4e3d67e78..0f35de0e8 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/List.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cache/List.php
@@ -97,7 +97,7 @@ class Horde_Kolab_Storage_Cache_List
     private function _load()
     {
         if ($this->_data === false) {
-            $this->_data = $this->_cache->loadListData($this->_list_id);
+            $this->_data = unserialize($this->_cache->loadListData($this->_list_id));
             if (!is_array($this->_data)) {
                 $this->_data = array();
             }
@@ -111,7 +111,7 @@ class Horde_Kolab_Storage_Cache_List
      */
     public function save()
     {
-        $this->_cache->storeListData($this->_list_id, $this->_data);
+        $this->_cache->storeListData($this->_list_id, serialize($this->_data));
     }
 
     /**
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
index ec7e66408..0ec23c1b1 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/List/Decorator/CacheTest.php
@@ -282,7 +282,7 @@ extends Horde_Kolab_Storage_TestCase
                 $cache
             )
         );
-        $cache->storeListData($list->getConnectionId(), array('S' => time(), 'V' => '1'));
+        $cache->storeListData($list->getConnectionId(), serialize(array('S' => time(), 'V' => '1')));
         $this->mockDriver->expects($this->never())
             ->method('getMailboxes') 
             ->will($this->returnValue(array('INBOX')));
@@ -298,8 +298,7 @@ extends Horde_Kolab_Storage_TestCase
                 $cache
             )
         );
-        $cache->storeListData($list->getConnectionId(), 'S', time());
-        $cache->storeListData($list->getConnectionId(), 'V', '2');
+        $cache->storeListData($list->getConnectionId(), serialize(array('S' => time(), 'V' => '2')));
         $this->mockDriver->expects($this->once())
             ->method('getMailboxes') 
             ->will($this->returnValue(array('INBOX')));
-- 
2.11.0