Branch 'dev/libcalendaring' - 2 commits - plugins/kolab_config plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Fri Nov 2 13:46:09 CET 2012


 plugins/kolab_config/kolab_config.php |    2 +-
 plugins/libkolab/lib/kolab_format.php |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dbe7352ce100eb6c8d6619d68fe9b6a81b029112
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Nov 2 13:46:00 2012 +0100

    Fix default config folder selection (list is not indexed anymore)

diff --git a/plugins/kolab_config/kolab_config.php b/plugins/kolab_config/kolab_config.php
index 4fe8a7f..23188cf 100644
--- a/plugins/kolab_config/kolab_config.php
+++ b/plugins/kolab_config/kolab_config.php
@@ -77,7 +77,7 @@ class kolab_config extends rcube_plugin
 
         // if no folder is set as default, choose the first one
         if (!$this->default)
-            $this->default = $this->folders[0];
+            $this->default = reset($this->folders);
 
         // check if configuration folder exist
         if ($this->default && $this->default->name) {


commit 50b3b8e766ca081f492521a4f502284e139c8915
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Nov 2 13:45:05 2012 +0100

    Use different signatures for libkolab/libkolabxml function calls

diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index bedee44..760133b 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -350,7 +350,11 @@ abstract class kolab_format
     public function write($version = null)
     {
         $this->init();
-        $this->xmldata = call_user_func($this->libfunc($this->write_func), $this->obj, $this->libversion($version), self::PRODUCT_ID);
+		$write_func = $this->libfunc($this->write_func);
+		if (is_array($write_func))
+			$this->xmldata = call_user_func($write_func, $this->obj, $this->libversion($version), self::PRODUCT_ID);
+		else
+			$this->xmldata = call_user_func($write_func, $this->obj, self::PRODUCT_ID);
 
         if (!$this->format_errors())
             $this->update_uid();





More information about the commits mailing list