lib/kolab_sync.php

Aleksander Machniak machniak at kolabsys.com
Fri Mar 27 11:25:26 CET 2015


 lib/kolab_sync.php |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3d3b9c1c8a16e2a141656e52b12081fa313a1e11
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 27 06:25:06 2015 -0400

    Fix compatibility with Roundcube Framework 1.2

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);
+        }
     }
 
 




More information about the commits mailing list