MDL-43488 remoe city and country requirement from signup
This was supposed to be part of MDL-28558.
This commit is contained in:
@@ -1121,8 +1121,6 @@ $string['minute'] = 'minute';
|
||||
$string['minutes'] = 'minutes';
|
||||
$string['miscellaneous'] = 'Miscellaneous';
|
||||
$string['missingcategory'] = 'You need to choose a category';
|
||||
$string['missingcity'] = 'Missing city/town';
|
||||
$string['missingcountry'] = 'Missing country';
|
||||
$string['missingdescription'] = 'Missing description';
|
||||
$string['missingemail'] = 'Missing email address';
|
||||
$string['missingfirstname'] = 'Missing given name';
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user