Fix missing out on the correct sorting

12 years ago · 05ea61095f
parent 6ac9395fbd
commit 05ea61095f
1 changed files with 8 additions and 5 deletions
--- a/program/lib/Net/LDAP3.php
+++ b/program/lib/Net/LDAP3.php
@ -1847,12 +1847,15 @@ class Net_LDAP3
                        // 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;
-                            }
-                            else {
-                                return false;
+                            foreach ($vlv_index[$base_dn]['sort'] as $sss_config) {
+                                if (count(array_intersect($sort_attrs, $sss_config)) == count($sort_attrs)) {
+                                    return $sort_attrs;
+                                }
                            }
+
+                            $this->_error("The requested sorting does not match any server-side sorting configuration");
+
+                            return false;
                        }
                        else {
                            return $vlv_index[$base_dn]['sort'][0];