Commit 90c5be7d authored by Daniel Morlock's avatar Daniel Morlock

Merge branch 'feature_caldav_328' of...

Merge branch 'feature_caldav_328' of https://gitlab.awesome-it.de/kolab/roundcube-plugins into feature_caldav_328
parents ec8de335 2bcf25fc
......@@ -24,7 +24,8 @@ For example if `roundcubemail-plugins-kolab-3.1.13` is installed, you must check
```bash
$ cd /path/to/your/roundcube/
$ mv plugins/calendar plugins/calendar.orig
$ ln -s plugins-caldav/plugins/calendar plugins/calendar
$ cd plugins
$ ln -s ../plugins-caldav/plugins/calendar
```
If you use Roundcubemail without Kolab, you should put all plugins from the `feature_caldav` branch into your plugins folder. Please note that this is only rarely tested and we won't offer any support for this right now.
......@@ -112,4 +113,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Kolab Plugins
-------------
See http://git.kolab.org/roundcubemail-plugins-kolab/tree/plugins/calendar/LICENSE.
See http://git.kolab.org/roundcubemail-plugins-kolab/tree/plugins/calendar/LICENSE.
\ No newline at end of file
......@@ -147,12 +147,6 @@ class caldav_driver extends calendar_driver
*/
public function list_calendars($filter = 0)
{
// attempt to create a default calendar for this user
if (empty($this->calendars)) {
if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true)))
$this->_read_calendars();
}
$calendars = $this->calendars;
// filter active calendars
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment