From 05ea61095f406dfdd04afd801b68399008e25bef Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date: Sat, 02 Aug 2014 10:46:29 -0400
Subject: [PATCH] Fix missing out on the correct sorting
---
program/lib/Net/LDAP3.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/program/lib/Net/LDAP3.php b/program/lib/Net/LDAP3.php
index b101b4a..1b3ac73 100644
--- a/program/lib/Net/LDAP3.php
+++ b/program/lib/Net/LDAP3.php
@@ -1847,12 +1847,15 @@
// Not passing any sort attributes means you don't care
if (!empty($sort_attrs)) {
$sort_attrs = (array) $sort_attrs;
- if (count(array_intersect($sort_attrs, $vlv_index[$base_dn]['sort'])) == count($sort_attrs)) {
- return $sort_attrs;
+ foreach ($vlv_index[$base_dn]['sort'] as $sss_config) {
+ if (count(array_intersect($sort_attrs, $sss_config)) == count($sort_attrs)) {
+ return $sort_attrs;
+ }
}
- else {
- return false;
- }
+
+ $this->_error("The requested sorting does not match any server-side sorting configuration");
+
+ return false;
}
else {
return $vlv_index[$base_dn]['sort'][0];
--
Gitblit v1.9.1