Branch 'dev/kolab-cache-refactoring' - plugins/libkolab

[Aleksander Machniak]

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

New commits:
commit e8f2cd98a32c97e5e4a358dacd7494f427531847
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Wed Oct 9 09:58:19 2013 +0200

    Fix get_objects() when called with no argument, folder type is used

diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 34d119e..2c42103 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -384,7 +384,7 @@ class kolab_storage_folder
         $this->cache->synchronize();
 
         // fetch objects from cache
-        return $this->cache->select(array());
+        return $this->cache->select($this->_prepare_query($type));
     }
 
 
@@ -433,7 +433,7 @@ class kolab_storage_folder
         // string equals type query
         // FIXME: should not be called this way!
         if (is_string($query)) {
-            return $this->cache->has_type_col() ? array(array('type','=',$query)) : array();
+            return $this->cache->has_type_col() && !empty($type) ? array(array('type','=',$query)) : array();
         }
 
         foreach ((array)$query as $i => $param) {