Bugfix and improve auto-completion

git-svn-id: https://svn.roundcube.net/trunk@2176 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 1 deletions

diff --git a/roundcubemail/program/steps/mail/autocomplete.inc b/roundcubemail/program/steps/mail/autocomplete.inc
index 4bc5dc263..fe011de0a 100644
--- a/roundcubemail/program/steps/mail/autocomplete.inc
+++ b/roundcubemail/program/steps/mail/autocomplete.inc
@@ -19,13 +19,14 @@
 
 */
 
+$MAXNUM = 15;  // same limit as in app.js
 $contacts = array();
 
 if ($search = get_input_value('_search', RCUBE_INPUT_POST)) {
 
   foreach ($RCMAIL->config->get('autocomplete_addressbooks', array('sql')) as $id) {
     $abook = $RCMAIL->get_address_book($id);
-    $abook->set_pagesize(20);
+    $abook->set_pagesize($MAXNUM);
 
     if ($result = $abook->search(array('email','name'), $search)) {
       while ($sql_arr = $result->iterate()) {
@@ -34,6 +35,9 @@ if ($search = get_input_value('_search', RCUBE_INPUT_POST)) {
         }
       }
     }
+    
+    if (count($contacts) >= $MAXNUM)
+      break;
   }
   
   sort($contacts);