plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Tue Feb 3 17:26:14 CET 2015


 plugins/libkolab/lib/kolab_storage_cache.php  |    2 +-
 plugins/libkolab/lib/kolab_storage_folder.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 29645a47367a8e5927bde5ac55370eae191ba9f8
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Feb 3 17:26:03 2015 +0100

    Fix db table reference; forward constructor argument (#4471)

diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index f0eeb1a..227fa4e 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -100,7 +100,7 @@ class kolab_storage_cache
      */
     public function select_by_id($folder_id)
     {
-        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM `{$this->cache_table}` WHERE `folder_id` = ?", $folder_id));
+        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM `{$this->folders_table}` WHERE `folder_id` = ?", $folder_id));
         if ($sql_arr) {
             $this->metadata = $sql_arr;
             $this->folder_id = $sql_arr['folder_id'];
diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 6c21ed4..b1546e9 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -51,7 +51,7 @@ class kolab_storage_folder extends kolab_storage_folder_api
     {
         parent::__construct($name);
         $this->imap->set_options(array('skip_deleted' => true));
-        $this->set_folder($name, $type);
+        $this->set_folder($name, $type, $type_annotation);
     }
 
 




More information about the commits mailing list