- Fix setting default addressbook as selected in source selector

git-svn-id: https://svn.roundcube.net/trunk@5009 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 8 insertions, 3 deletions

diff --git a/roundcubemail/program/steps/addressbook/edit.inc b/roundcubemail/program/steps/addressbook/edit.inc
index 69fcba93c..0ad977d1a 100644
--- a/roundcubemail/program/steps/addressbook/edit.inc
+++ b/roundcubemail/program/steps/addressbook/edit.inc
@@ -43,7 +43,12 @@ if ($RCMAIL->action == 'edit') {
 else {
     $source = get_input_value('_source', RCUBE_INPUT_GPC);
 
-    $CONTACTS = $RCMAIL->get_address_book($source);
+    if (!strlen($source)) {
+        // Give priority to configured default
+        $source = $RCMAIL->config->get('default_addressbook');
+    }
+
+    $CONTACTS = $RCMAIL->get_address_book($source, true);
 
     // find writable addressbook
     if (!$CONTACTS || $CONTACTS->readonly)
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc
index 932d34935..7fb1e2c29 100644
--- a/roundcubemail/program/steps/addressbook/func.inc
+++ b/roundcubemail/program/steps/addressbook/func.inc
@@ -150,10 +150,10 @@ function rcmail_default_source($writable=false)
     global $RCMAIL;
 
     // get list of address sources
-    $list = $RCMAIL->get_address_sources($writable);
+    $first = reset($RCMAIL->get_address_sources($writable));
 
     // use first directory by default
-    return $list[key($list)]['id'];
+    return $first['id'];
 }
 
 function rcmail_set_sourcename($abook)