Branch 'roundcubemail-plugins-kolab-3.1' - 2 commits - plugins/libkolab
Aleksander Machniak
machniak at kolabsys.com
Wed Feb 4 11:55:44 CET 2015
plugins/libkolab/lib/kolab_storage.php | 11 +++++------
plugins/libkolab/lib/kolab_storage_folder.php | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit b0be19f77fbdff9c6d800192ece1af8fcd251252
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Wed Feb 4 05:46:11 2015 -0500
Fix type change detection in set_folder()
diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 0610325..f7370bb 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -103,7 +103,7 @@ class kolab_storage_folder
$this->owner = $this->namespace = $this->resource_uri = $this->info = $this->idata = null;
// get a new cache instance of folder type changed
- if (!$this->cache || $type != $oldtype)
+ if (!$this->cache || $this->type != $oldtype)
$this->cache = kolab_storage_cache::factory($this);
else
$this->cache->set_folder($this);
commit 2dd7187833cc19fcd7ced98f5d26901e39f1ba4f
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Wed Feb 4 05:45:34 2015 -0500
Add optional $type argument in kolab_storage::get_folder()
Conflicts:
plugins/libkolab/lib/kolab_storage.php
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 2a4bf98..9ef3057 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -106,7 +106,6 @@ class kolab_storage
return self::$ready;
}
-
/**
* Get a list of storage folders for the given data type
*
@@ -145,19 +144,19 @@ class kolab_storage
return null;
}
-
/**
* Getter for a specific storage folder
*
- * @param string IMAP folder to access (UTF7-IMAP)
+ * @param string IMAP folder to access (UTF7-IMAP)
+ * @param string Expected folder type
+ *
* @return object kolab_storage_folder The folder object
*/
- public static function get_folder($folder)
+ public static function get_folder($folder, $type = null)
{
- return self::setup() ? new kolab_storage_folder($folder) : null;
+ return self::setup() ? new kolab_storage_folder($folder, $type) : null;
}
-
/**
* Getter for a single Kolab object, identified by its UID.
* This will search all folders storing objects of the given type.
More information about the commits
mailing list