diff options
author | Aleksander Machniak <machniak@kolabsys.com> | 2015-01-06 07:46:16 (GMT) |
---|---|---|
committer | Aleksander Machniak <machniak@kolabsys.com> | 2015-01-06 07:46:16 (GMT) |
commit | 73234b2f33ad1d94b178e6767469d3cbf6f1b029 (patch) | |
tree | a676345d8be8e661c7de3eb0172fa5ebe197c14e | |
parent | 98c982f181c648e8f1003d69816e412455ee64eb (diff) | |
parent | c2cc70eec3ebbdb36d62f5cba64148ea06647673 (diff) | |
download | Net_LDAP3-73234b2f33ad1d94b178e6767469d3cbf6f1b029.tar.gz |
Merge branch 'master' of ssh://git.kolabsys.com/git/pear/Net_LDAP3
-rw-r--r-- | lib/Net/LDAP3.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php index e141014..fb81671 100644 --- a/lib/Net/LDAP3.php +++ b/lib/Net/LDAP3.php @@ -1559,6 +1559,8 @@ class Net_LDAP3 $attrs = array('dn'); } + $function = self::scope_to_function($scope, $ns_function); + if (!$count_only && ($sort = $this->find_vlv($base_dn, $filter, $scope, $props['sort']))) { // when using VLV, we get the total count by... // ...either reading numSubOrdinates attribute @@ -1584,7 +1586,6 @@ class Net_LDAP3 $this->vlv_active = false; } - $function = self::scope_to_function($scope, $ns_function); $sizelimit = (int) $this->config['sizelimit']; $timelimit = (int) $this->config['timelimit']; $phplimit = (int) @ini_get('max_execution_time'); |