Branch 'dev/libcalendaring' - plugins/libkolab
Thomas Brüderli
bruederli at kolabsys.com
Fri Nov 2 15:05:06 CET 2012
plugins/libkolab/lib/kolab_format.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit dd2bf15adf7e39612df9548095ac1ed8cafb33a1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Fri Nov 2 15:04:59 2012 +0100
Also use different signatures when calling libkolab(xml) read functions
diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index 760133b..08dc962 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -332,7 +332,12 @@ abstract class kolab_format
*/
public function load($xml)
{
- $r = call_user_func($this->libfunc($this->read_func), $xml, $this->libversion());
+ $read_func = $this->libfunc($this->read_func);
+ if (is_array($read_func))
+ $r = call_user_func($read_func, $xml, $this->libversion());
+ else
+ $r = call_user_func($read_func, $xml, false);
+
if (is_resource($r))
$this->obj = new $this->objclass($r);
else if (is_a($r, $this->objclass))
More information about the commits
mailing list