mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-58286-master' of https://github.com/xow/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-07-05 09:39:21 +02:00
commit 9a334cb444
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
enrol/ldap/lib.php
View File

@ -328,7 +328,7 @@ class enrol_ldap_plugin extends enrol_plugin {
return; return;
} }
$ldap_pagedresults = ldap_paged_results_supported($this->get_config('ldap_version')); $ldap_pagedresults = ldap_paged_results_supported($this->get_config('ldap_version'), $this->ldapconnection);
// we may need a lot of memory here // we may need a lot of memory here
core_php_time_limit::raise(); core_php_time_limit::raise();
@ -761,7 +761,7 @@ class enrol_ldap_plugin extends enrol_plugin {
// Get all contexts and look for first matching user // Get all contexts and look for first matching user
$ldap_contexts = explode(';', $ldap_contexts); $ldap_contexts = explode(';', $ldap_contexts);
$ldap_pagedresults = ldap_paged_results_supported($this->get_config('ldap_version')); $ldap_pagedresults = ldap_paged_results_supported($this->get_config('ldap_version'), $this->ldapconnection);
foreach ($ldap_contexts as $context) { foreach ($ldap_contexts as $context) {
$context = trim($context); $context = trim($context);
if (empty($context)) { if (empty($context)) {