L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w02_MDL-43488_m26_signreq' of https://github.com/skodak/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2014-01-14 13:18:35 +08:00
parent 020705cca0 a27c1faa9f
commit 5a0cf2cda0
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
login/signup_form.php
-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);