summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-29 06:48:09 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-29 06:48:09 +0000
commitd3ad9500a897ee3165faeb1eb753b00d4c2cf289 (patch)
tree13b7a14eaccfdf2182fa133c6c6667cba71277c8
parent7728fc147efaabe076fce269bf17ab0d2106271c (diff)
- Fix 'sql' identifier for addressbook handling (#1488013)
git-svn-id: https://svn.roundcube.net/trunk@4987 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcmail.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 396106e42..33956c3eb 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -386,6 +386,10 @@ class rcmail
$ldap_config = (array)$this->config->get('ldap_public');
$abook_type = strtolower($this->config->get('address_book_type'));
+ // 'sql' is the alias for '0' used by autocomplete
+ if ($id == 'sql')
+ $id = '0';
+
// use existing instance
if (isset($this->address_books[$id]) && is_a($this->address_books[$id], 'rcube_addressbook') && (!$writeable || !$this->address_books[$id]->readonly)) {
$contacts = $this->address_books[$id];