Merge branch 'MDL-59734-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
David Monllao 2017-08-07 08:31:24 +02:00
commit 7643d75af0
2 changed files with 2 additions and 2 deletions

View File

@ -928,7 +928,7 @@ class auth_plugin_ldap extends auth_plugin_base {
$id = user_create_user($user, false);
echo "\t"; print_string('auth_dbinsertuser', 'auth_db', array('name'=>$user->username, 'id'=>$id)); echo "\n";
$euser = $DB->get_record('user', array('id' => $id));
$user = $DB->get_record('user', array('id' => $id));
if (!empty($this->config->forcechangepassword)) {
set_user_preference('auth_forcepasswordchange', 1, $id);

View File

@ -110,7 +110,7 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
set_config('user_attribute', 'cn', 'auth_ldap');
set_config('memberattribute', 'memberuid', 'auth_ldap');
set_config('memberattribute_isdn', 0, 'auth_ldap');
set_config('creators', 'cn=creators,'.$topdn, 'auth_ldap');
set_config('coursecreatorcontext', 'cn=creators,'.$topdn, 'auth_ldap');
set_config('removeuser', AUTH_REMOVEUSER_KEEP, 'auth_ldap');
set_config('field_map_email', 'mail', 'auth_ldap');