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

Merge branch 'wip-mdl-32787-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2012-07-04 08:25:46 +12:00
parent 54bf19763e 4598cc934a
commit 56861454c1
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/edit.php
+1 -1
View File
@@ -153,7 +153,7 @@ $editoroptions = array(
);
$user = file_prepare_standard_editor($user, 'description', $editoroptions, $personalcontext, 'user', 'profile', 0);
$userform = new user_edit_form(null, array('editoroptions'=>$editoroptions));
$userform = new user_edit_form(null, array('editoroptions'=>$editoroptions, 'userid' => $user->id));
if (empty($user->country)) {
// MDL-16308 - we must unset the value here so $CFG->country can be used as default one
unset($user->country);