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

This commit is contained in:
Thomas Bruederli 2011-07-20 15:39:01 +02:00
commit 266dcaf07d

View file

@ -155,9 +155,6 @@ class kolab_addressbook_ui
), ),
); );
if (strlen($path_imap)) {
$path = rcube_charset_convert($path_imap, 'UTF7-IMAP');
// @TODO: $options
if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) { if (!empty($options) && ($options['norename'] || $options['namespace'] != 'personal')) {
// prevent user from moving folder // prevent user from moving folder
$hidden_fields[] = array('name' => '_parent', 'value' => $path_imap); $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap);
@ -170,7 +167,6 @@ class kolab_addressbook_ui
'value' => $select->show($path_imap), 'value' => $select->show($path_imap),
); );
} }
}
// Allow plugins to modify address book form content (e.g. with ACL form) // Allow plugins to modify address book form content (e.g. with ACL form)
$plugin = $this->rc->plugins->exec_hook('addressbook_form', $plugin = $this->rc->plugins->exec_hook('addressbook_form',