summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-04 10:05:35 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-04 10:05:35 +0000
commitf62952be3eee380421f25102b8712b9decba9cee (patch)
tree1f2ae1175bd179acde314dccedd074717f709429
parentcb736b12f092c3a36dbb8be41b6c980de34a5494 (diff)
Always list all address sources
git-svn-id: https://svn.roundcube.net/trunk@1725 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/steps/addressbook/func.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc
index c4fbab219..51a45f97d 100644
--- a/roundcubemail/program/steps/addressbook/func.inc
+++ b/roundcubemail/program/steps/addressbook/func.inc
@@ -43,8 +43,8 @@ $js_list = array();
if (strtolower($CONFIG['address_book_type']) != 'ldap') {
// We are using the DB address book, add it.
$js_list = array("0" => array('id' => 0, 'readonly' => false));
-} // end if
-else if (!empty($CONFIG['ldap_public'])) {
+}
+if (is_array($CONFIG['ldap_public'])) {
foreach ($CONFIG['ldap_public'] as $id => $prop)
$js_list[$id] = array('id' => $id, 'readonly' => !$prop['writable']);
}