Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

This commit is contained in:
Sam Hemelryk 2012-07-23 12:25:20 +12:00
commit 6fcebf2424

View file

@ -67,7 +67,7 @@ class enrol_self_enrol_form extends moodleform {
if ($instance->password) { if ($instance->password) {
//change the id of self enrolment key input as there can be multiple self enrolment methods //change the id of self enrolment key input as there can be multiple self enrolment methods
$mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_self'), $mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_self'),
array('id' => $instance->id."_enrolpassword")); array('id' => 'enrolpassword_'.$instance->id));
} else { } else {
$mform->addElement('static', 'nokey', '', get_string('nopassword', 'enrol_self')); $mform->addElement('static', 'nokey', '', get_string('nopassword', 'enrol_self'));
} }
@ -127,4 +127,4 @@ class enrol_self_enrol_form extends moodleform {
return $errors; return $errors;
} }
} }