summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-07-18 16:57:15 +0000
committerthomascube <thomas@roundcube.net>2011-07-18 16:57:15 +0000
commit3a9f7954baf92a40ee149c8d0acc3e56826945ff (patch)
treeda9cbfba96dd8cd006e81ac2d94b05d5d9ed1d4f
parent03eb13f11cf7dd695be3aab95b4e39e510169a49 (diff)
Fix getting first writeable address book if no default is configured
-rw-r--r--program/steps/mail/addcontact.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index 57bc2a1c6..b74d95faa 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -30,8 +30,9 @@ $CONTACTS = $RCMAIL->get_address_book($abook, true);
// Get first writeable addressbook if the configured doesn't exist
// This can happen when user deleted the addressbook (e.g. Kolab folder)
-if ($abook !== null && !is_object($CONTACTS)) {
- $CONTACTS = $RCMAIL->get_address_book(null, true);
+if ($abook == null || !is_object($CONTACTS)) {
+ $source = reset($RCMAIL->get_address_sources(true));
+ $CONTACTS = $RCMAIL->get_address_book($source['id'], true);
}
if (!empty($_POST['_address']) && is_object($CONTACTS))