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

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

Browse source
This commit is contained in:
Thomas 2011-07-05 19:45:24 +02:00
commit 631f19ca5e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -92,7 +92,7 @@ class calendar extends rcube_plugin
$this->include_stylesheet('skins/' . $skin . '/calendar.css');
}
if ($this->rc->task == 'calendar') {
if ($this->rc->task == 'calendar' && $this->rc->action != 'save-pref') {
$this->load_driver();
// load iCalendar functions

5
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -15,7 +15,7 @@ class rcube_kolab_contacts extends rcube_addressbook
public $primary_key = 'ID';
public $readonly = true;
public $editable = false;
public $groups = false;
public $groups = true;
public $coltypes = array(
'name' => array('limit' => 1),
'firstname' => array('limit' => 1),
@ -133,9 +133,6 @@ class rcube_kolab_contacts extends rcube_addressbook
if (strpos($acl, 'a') !== false || strpos($acl, 'x') !== false)
$this->editable = true;
}
if (!$this->readonly)
$this->groups = true;
}
}