Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube

This commit is contained in:
Thomas 2011-05-24 23:22:54 +02:00
commit 1ccb8f198a
3 changed files with 6 additions and 2 deletions

View file

@ -54,7 +54,7 @@ class calendar extends rcube_plugin
// load Calendar user interface which includes jquery-ui // load Calendar user interface which includes jquery-ui
$this->require_plugin('jqueryui'); $this->require_plugin('jqueryui');
require('lib/calendar_ui.php'); require($this->home . '/lib/calendar_ui.php');
$this->ui = new calendar_ui($this); $this->ui = new calendar_ui($this);
$this->ui->init(); $this->ui->init();
@ -65,7 +65,7 @@ class calendar extends rcube_plugin
$this->load_driver(); $this->load_driver();
// load iCalendar functions // load iCalendar functions
require('lib/calendar_ical.php'); require($this->home . '/lib/calendar_ical.php');
$this->ical = new calendar_ical($this->rc, $this->driver); $this->ical = new calendar_ical($this->rc, $this->driver);
// register calendar actions // register calendar actions

View file

@ -24,6 +24,8 @@ pear install horde/Log
pear install horde/Kolab_Format pear install horde/Kolab_Format
pear install horde/Kolab_Storage pear install horde/Kolab_Storage
WARNING: This procedure installs Horde4 sources that doesn't work with this plugin!
Configuration Configuration
------------- -------------

View file

@ -1,5 +1,7 @@
<?php <?php
ini_set('error_reporting', E_ALL&~(E_DEPRECATED | E_NOTICE));
require_once 'Horde/Kolab/Storage/List.php'; require_once 'Horde/Kolab/Storage/List.php';
require_once 'Horde/Kolab/Format.php'; require_once 'Horde/Kolab/Format.php';
require_once 'Horde/Auth.php'; require_once 'Horde/Auth.php';