summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-07-30 14:53:30 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-10-17 12:47:32 (GMT)
commit061def18a1460e9646d3a5a42ff3bf062964dce8 (patch)
treeed34b013472743c22c25932cd731dd93acfb09a3
parent4a35201c6e4b5d734cfb8e2e154762ff3934187d (diff)
downloadroundcubemail-plugins-kolab-061def18a1460e9646d3a5a42ff3bf062964dce8.tar.gz
Fix caching configuration objects
-rw-r--r--plugins/libkolab/lib/kolab_storage_cache.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index 4a1746b..4fa3d09 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -755,12 +755,15 @@ class kolab_storage_cache
}
}
+ $object_type = $sql_arr['type'] ?: $this->folder->type;
+ $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
+
// add meta data
- $object['_type'] = $sql_arr['type'] ?: $this->folder->type;
+ $object['_type'] = $object_type;
$object['_msguid'] = $sql_arr['msguid'];
$object['_mailbox'] = $this->folder->name;
$object['_size'] = strlen($sql_arr['xml']);
- $object['_formatobj'] = kolab_format::factory($object['_type'], 3.0, $sql_arr['xml']);
+ $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
return $object;
}