summaryrefslogtreecommitdiff
path: root/plugins/libkolab/lib/kolab_format_configuration.php
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-01-16 08:27:34 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2013-01-16 08:27:34 (GMT)
commitddeb606dafc9e53063e5c4534070015389a35440 (patch)
tree5015e0b90e79e3fd1b5ec801a9ddbfab5021bfa0 /plugins/libkolab/lib/kolab_format_configuration.php
parentf38105a8092c3019c689550ca96229b99d6592ef (diff)
downloadroundcubemail-plugins-kolab-ddeb606dafc9e53063e5c4534070015389a35440.tar.gz
Fix File support. Fix handling of non-inline attachments of event and file objects.
Diffstat (limited to 'plugins/libkolab/lib/kolab_format_configuration.php')
-rw-r--r--plugins/libkolab/lib/kolab_format_configuration.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php
index 0edc6a2..5e64e30 100644
--- a/plugins/libkolab/lib/kolab_format_configuration.php
+++ b/plugins/libkolab/lib/kolab_format_configuration.php
@@ -88,9 +88,11 @@ class kolab_format_configuration extends kolab_format
/**
* Convert the Configuration object into a hash array data structure
*
+ * @param array Additional data for merge
+ *
* @return array Config object data as hash array
*/
- public function to_array()
+ public function to_array($data = array())
{
// return cached result
if (!empty($this->data))