summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2015-03-27 10:25:06 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2015-03-27 10:25:06 (GMT)
commit3d3b9c1c8a16e2a141656e52b12081fa313a1e11 (patch)
tree476642d50244deaee7fe4b1d81da450ce9df5e34
parent5c28f190871226848ee6852c6e52bc8cb22c4095 (diff)
downloadkolab-syncroton-3d3b9c1c8a16e2a141656e52b12081fa313a1e11.tar.gz
Fix compatibility with Roundcube Framework 1.2
-rw-r--r--lib/kolab_sync.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/kolab_sync.php b/lib/kolab_sync.php
index 65e3a8d..2a8c207 100644
--- a/lib/kolab_sync.php
+++ b/lib/kolab_sync.php
@@ -79,12 +79,17 @@ class kolab_sync extends rcube
// e.g. are not using output or rcmail objects or
// doesn't throw errors when using them
$plugins = (array)$this->config->get('activesync_plugins', array('kolab_auth'));
- $required = array('libkolab');
+ $plugins = array_unique(array_merge($plugins, array('libkolab')));
// Initialize/load plugins
$this->plugins = kolab_sync_plugin_api::get_instance();
$this->plugins->init($this, $this->task);
- $this->plugins->load_plugins($plugins, $required);
+
+ // this way we're compatible with Roundcube Framework 1.2
+ // we can't use load_plugins() here
+ foreach ($plugins as $plugin) {
+ $this->plugins->load_plugin($plugin, true);
+ }
}