Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include Kolab calendar classes AFTER libkolab has been loaded (#3248)

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-07 17:41:17 +02:00
parent f41cca6c09
commit e7f1fd4082
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -23,11 +23,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
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 class kolab_driver extends calendar_driver
{ {
const INVITATIONS_CALENDAR_PENDING = '--invitation--pending'; const INVITATIONS_CALENDAR_PENDING = '--invitation--pending';
@ -56,6 +51,11 @@ class kolab_driver extends calendar_driver
{ {
$cal->require_plugin('libkolab'); $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->cal = $cal;
$this->rc = $cal->rc; $this->rc = $cal->rc;
$this->_read_calendars(); $this->_read_calendars();