Changeset 5009 in subversion

Timestamp:

Aug 2, 2011 1:17:59 PM (22 months ago)

Author:

alec

Message:

• Fix setting default addressbook as selected in source selector

Location:

trunk/roundcubemail/program/steps/addressbook

Files:

• edit.inc (modified) (1 diff)
• func.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/addressbook/edit.inc

@@ -44 +44 @@
     $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

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -151 +151 @@
 
     // 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'];
 }