From e7f1fd4082bad327de5b50f8ecb99aa749850bed Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Thu, 7 Aug 2014 17:41:17 +0200 Subject: [PATCH] Include Kolab calendar classes AFTER libkolab has been loaded (#3248) --- plugins/calendar/drivers/kolab/kolab_driver.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php index 869d56bb..63711b04 100644 --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -23,11 +23,6 @@ * along with this program. If not, see . */ -require_once(dirname(__FILE__) . '/kolab_calendar.php'); -require_once(dirname(__FILE__) . '/kolab_user_calendar.php'); -require_once(dirname(__FILE__) . '/kolab_invitation_calendar.php'); - - class kolab_driver extends calendar_driver { const INVITATIONS_CALENDAR_PENDING = '--invitation--pending'; @@ -56,6 +51,11 @@ class kolab_driver extends calendar_driver { $cal->require_plugin('libkolab'); + // load helper classes *after* libkolab has been loaded (#3248) + require_once(dirname(__FILE__) . '/kolab_calendar.php'); + require_once(dirname(__FILE__) . '/kolab_user_calendar.php'); + require_once(dirname(__FILE__) . '/kolab_invitation_calendar.php'); + $this->cal = $cal; $this->rc = $cal->rc; $this->_read_calendars();