From c0297f4172da47a20350d597176ecafee47c97bb Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 31 Mar 2010 15:23:22 +0000
Subject: Asynchronously expand contact groups + skip count queries in
 autocompletion mode + check for the existance of contactgroups table

---
 program/include/rcmail.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'program/include/rcmail.php')

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 77ebb28b6..f1e9d3fc9 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -298,10 +298,11 @@ class rcmail
 
     // We are using the DB address book
     if ($abook_type != 'ldap') {
+      $contacts = new rcube_contacts($this->db, null);
       $list['0'] = array(
         'id' => 0,
         'name' => rcube_label('personaladrbook'),
-        'groups' => true,
+        'groups' => $contacts->groups,
         'readonly' => false,
         'autocomplete' => in_array('sql', $autocomplete)
       );
@@ -324,7 +325,7 @@ class rcmail
     if ($writeable && !empty($list)) {
       foreach ($list as $idx => $item) {
         if ($item['readonly']) {
-	  unset($list[$idx]);
+          unset($list[$idx]);
         }
       }
     }
-- 
cgit v1.2.3