mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-mdl-28558' of git://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-06-11 11:06:17 +12:00
commit 5d37fd271d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user/editlib.php
View File

@ -219,7 +219,6 @@ function useredit_shared_definition(&$mform, $editoroptions = null, $filemanager
$mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="21"');
$mform->setType('city', PARAM_TEXT);
$mform->addRule('city', $strrequired, 'required', null, 'client');
if (!empty($CFG->defaultcity)) {
$mform->setDefault('city', $CFG->defaultcity);
}
@ -227,7 +226,6 @@ function useredit_shared_definition(&$mform, $editoroptions = null, $filemanager
$choices = get_string_manager()->get_list_of_countries();
$choices= array(''=>get_string('selectacountry').'...') + $choices;
$mform->addElement('select', 'country', get_string('selectacountry'), $choices);
$mform->addRule('country', $strrequired, 'required', null, 'client');
if (!empty($CFG->country)) {
$mform->setDefault('country', $CFG->country);
}