From 6a907162c431b0bd1f3f63bb72ab83b830b8453b Mon Sep 17 00:00:00 2001 From: "Aleksander Machniak (Kolab Systems)" Date: Fri, 29 Jul 2011 19:21:26 +0200 Subject: [PATCH] Don't set parent folder to current folder on folder create. Most likely user will create root-level folders --- plugins/calendar/drivers/kolab/kolab_driver.php | 2 +- plugins/kolab_addressbook/lib/kolab_addressbook_ui.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php index 7383a8f8..192d4cda 100644 --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -923,7 +923,7 @@ class kolab_driver extends calendar_driver $select = rcube_kolab::folder_selector('event', array('name' => 'parent'), $folder); $form['props']['fieldsets']['location']['content']['path'] = array( 'label' => $this->cal->gettext('parentcalendar'), - 'value' => $select->show($path_imap), + 'value' => $select->show(strlen($folder) ? $path_imap : ''), ); } diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php index 83b97022..1cae4780 100644 --- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php +++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php @@ -166,7 +166,7 @@ class kolab_addressbook_ui $form['props']['fieldsets']['location']['content']['path'] = array( 'label' => $this->plugin->gettext('parentbook'), - 'value' => $select->show($path_imap), + 'value' => $select->show(strlen($folder) ? $path_imap : ''), ); }