- Apply fixes fom trunk up to r5414

2 files changed, 7 insertions, 4 deletions

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index 488e72722..c4011a81c 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -1,7 +1,7 @@
 /**
  * ACL plugin script
  *
- * @version 0.6.2
+ * @version 0.6.3
  * @author Aleksander Machniak <alec@alec.pl>
  */
 
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index fe7d0d5eb..1448fb088 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -3,7 +3,7 @@
 /**
  * Folders Access Control Lists Management (RFC4314, RFC2086)
  *
- * @version 0.6.2
+ * @version 0.6.3
  * @author Aleksander Machniak <alec@alec.pl>
  *
  *
@@ -91,8 +91,11 @@ class acl extends rcube_plugin
         $users  = array();
 
         if ($this->init_ldap()) {
-            $this->ldap->set_pagesize((int)$this->rc->config->get('autocomplete_max', 15));
-            $result = $this->ldap->search('*', $search);
+            $max  = (int) $this->rc->config->get('autocomplete_max', 15);
+            $mode = (int) $this->rc->config->get('addressbook_search_mode');
+
+            $this->ldap->set_pagesize($max);
+            $result = $this->ldap->search('*', $search, $mode);
 
             foreach ($result->records as $record) {
                 $user = $record['uid'];