From dd2bf15adf7e39612df9548095ac1ed8cafb33a1 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 2 Nov 2012 15:04:59 +0100 Subject: [PATCH] Also use different signatures when calling libkolab(xml) read functions --- plugins/libkolab/lib/kolab_format.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php index 760133ba..08dc9626 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))