summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-04-01 15:54:57 +0000
committeralecpl <alec@alec.pl>2010-04-01 15:54:57 +0000
commit7fdb9da98e080ad623e3099c05eab17041013cab (patch)
treec97098cf09c991792a01de3a9bd6d6a77401ee5b
parent44155cddc28d49e005f12320931d3c81b053f5e2 (diff)
- Fix sources list if 'ldap_public' is null/false
-rw-r--r--program/include/rcmail.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 09957ee0f..c9a06584a 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -292,8 +292,8 @@ class rcmail
public function get_address_sources($writeable = false)
{
$abook_type = strtolower($this->config->get('address_book_type'));
- $ldap_config = (array)$this->config->get('ldap_public');
- $autocomplete = (array)$this->config->get('autocomplete_addressbooks');
+ $ldap_config = $this->config->get('ldap_public');
+ $autocomplete = (array) $this->config->get('autocomplete_addressbooks');
$list = array();
// We are using the DB address book
@@ -308,7 +308,8 @@ class rcmail
);
}
- if (is_array($ldap_config)) {
+ if ($ldap_config) {
+ $ldap_config = (array) $ldap_config;
foreach ($ldap_config as $id => $prop)
$list[$id] = array(
'id' => $id,
@@ -329,7 +330,7 @@ class rcmail
}
}
}
-
+
return $list;
}