Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'w51_MDL-37315_m24_ldappaging' of git://github.com/skoda…

…k/moodle into MOODLE_24_STABLE
  • Loading branch information...
commit 0c1be2af2178fbb4c4309e6f2f5e12b35cbef8de 2 parents d63a406 + e6a3c6e
@samhemelryk samhemelryk authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 enrol/ldap/lib.php
View
4 enrol/ldap/lib.php
@@ -653,7 +653,7 @@ protected function ldap_close() {
* @param object role is a record from the mdl_role table.
* @return array
*/
- protected function find_ext_enrolments ($ldapconnection, $memberuid, $role) {
+ protected function find_ext_enrolments (&$ldapconnection, $memberuid, $role) {
global $CFG;
require_once($CFG->libdir.'/ldaplib.php');
@@ -718,13 +718,13 @@ protected function find_ext_enrolments ($ldapconnection, $memberuid, $role) {
// Get all contexts and look for first matching user
$ldap_contexts = explode(';', $ldap_contexts);
$ldap_pagedresults = ldap_paged_results_supported($this->get_config('ldap_version'));
- $ldap_cookie = '';
foreach ($ldap_contexts as $context) {
$context = trim($context);
if (empty($context)) {
continue;
}
+ $ldap_cookie = '';
$flat_records = array();
do {
if ($ldap_pagedresults) {
Please sign in to comment.
Something went wrong with that request. Please try again.