Branch 'dev/kolab3' - plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Wed May 9 14:10:26 CEST 2012


 plugins/libkolab/libkolab.php |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 3a05fb691ff0a1da69bc2714286de2459af9a419
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed May 9 14:10:02 2012 +0200

    Make Horde library optional

diff --git a/plugins/libkolab/libkolab.php b/plugins/libkolab/libkolab.php
index 23816a6..3d0709b 100644
--- a/plugins/libkolab/libkolab.php
+++ b/plugins/libkolab/libkolab.php
@@ -47,14 +47,15 @@ class libkolab extends rcube_plugin
         $rcmail = rcmail::get_instance();
         kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
 
-        // load (old) dependencies
-        require_once 'Horde/Util.php';
-        require_once 'Horde/Kolab/Format.php';
-        require_once 'Horde/Kolab/Format/XML.php';
-        require_once 'Horde/Kolab/Format/XML/contact.php';
-        require_once 'Horde/Kolab/Format/XML/event.php';
+        // load (old) dependencies if available
+        if (@include_once('Horde/Util.php')) {
+            include_once 'Horde/Kolab/Format.php';
+            include_once 'Horde/Kolab/Format/XML.php';
+            include_once 'Horde/Kolab/Format/XML/contact.php';
+            include_once 'Horde/Kolab/Format/XML/event.php';
 
-        String::setDefaultCharset('UTF-8');
+            String::setDefaultCharset('UTF-8');
+        }
     }
 
     /**





More information about the commits mailing list