summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2012-05-30 12:25:13 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2012-05-30 12:25:13 (GMT)
commit41910ec06170af085e6e2fc9c9dabb395474cd18 (patch)
tree93863c774ad1bc3903deb5c0ebcbd2560282edc4 /plugins
parentf53a1662e348f3da416cac304b940959cb907cfa (diff)
downloadroundcubemail-plugins-kolab-41910ec06170af085e6e2fc9c9dabb395474cd18.tar.gz
Don't parse new configuration objects with old Horde classes
Diffstat (limited to 'plugins')
-rw-r--r--plugins/libkolab/lib/kolab_storage_folder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 6683879..684ed35 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -439,7 +439,7 @@ class kolab_storage_folder
// check kolab format version
list($xmltype, $subtype) = explode('.', $object_type);
- if (strpos($xml, '<' . $xmltype) !== false) {
+ if (strpos($xml, '<' . $xmltype) !== false && strpos($xml, 'xmlns=') === false) {
// old Kolab 2.0 format detected
$handler = class_exists('Horde_Kolab_Format') ? Horde_Kolab_Format::factory('XML', $xmltype, array('subtype' => $subtype)) : null;
if (!is_object($handler) || is_a($handler, 'PEAR_Error')) {