MDL-43488 remoe city and country requirement from signup

This was supposed to be part of MDL-28558.
This commit is contained in:
Petr Škoda
2014-01-12 18:23:56 +08:00
committed by Petr Škoda
parent 0e088aec08
commit a27c1faa9f
-2
View File
@@ -73,7 +73,6 @@ class login_signup_form extends moodleform {
$mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="20"');
$mform->setType('city', PARAM_TEXT);
$mform->addRule('city', get_string('missingcity'), 'required', null, 'server');
if (!empty($CFG->defaultcity)) {
$mform->setDefault('city', $CFG->defaultcity);
}
@@ -82,7 +81,6 @@ class login_signup_form extends moodleform {
$default_country[''] = get_string('selectacountry');
$country = array_merge($default_country, $country);
$mform->addElement('select', 'country', get_string('country'), $country);
$mform->addRule('country', get_string('missingcountry'), 'required', null, 'server');
if( !empty($CFG->country) ){
$mform->setDefault('country', $CFG->country);