summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-12-10 12:42:45 +0100
committerAleksander Machniak <alec@alec.pl>2012-12-10 12:42:45 +0100
commit1aaa4bc3937187c54039a8459409a2efd9cb3cd7 (patch)
treee717e510f8753f2b872f0a49ce80cfb67c0756fb
parent7b29770e2b0ba28d5871d2eabdfd405437e2eae9 (diff)
Fix PHP Warning: ldap_parse_virtuallist_control() expects parameter 2 to be
resource, null given. This happens on Administrative Limit Exceeded error when using VLV.
-rw-r--r--program/lib/Roundcube/rcube_ldap.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index c9a14d863..c32cea728 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -1455,6 +1455,7 @@ class rcube_ldap extends rcube_addressbook
if ($this->vlv_active && function_exists('ldap_parse_virtuallist_control')) {
if (ldap_parse_result($this->conn, $this->ldap_result,
$errcode, $matcheddn, $errmsg, $referrals, $serverctrls)
+ && $serverctrls // can be null e.g. in case of adm. limit error
) {
ldap_parse_virtuallist_control($this->conn, $serverctrls,
$last_offset, $this->vlv_count, $vresult);