Branch 'kolab-webadmin-3.0' - lib/Auth
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sat Sep 22 13:24:38 CEST 2012
lib/Auth/LDAP.php | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit bdb9d19943e521fce85735ca6f402af469b845fa
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sat Sep 22 12:24:01 2012 +0100
When VLV is active, sort_and_slice should simply return the results as stated
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 7c4e626..e7a2656 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -969,6 +969,10 @@ class LDAP extends Net_LDAP3 {
private function sort_and_slice(&$result, &$params) {
$entries = $result->entries(TRUE);
+ if ($this->vlv_active) {
+ return $entries;
+ }
+
if (!empty($params) && is_array($params)) {
if (array_key_exists('sort_by', $params)) {
$this->sort_result_key = $params['sort_by'];
More information about the commits
mailing list