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

This commit is contained in:
Sam Hemelryk
2012-07-04 08:26:14 +12:00
5 changed files with 39 additions and 26 deletions
+2 -1
View File
@@ -165,7 +165,8 @@ $user->imagefile = $draftitemid;
//create form
$userform = new user_edit_form(null, array(
'editoroptions' => $editoroptions,
'filemanageroptions' => $filemanageroptions));
'filemanageroptions' => $filemanageroptions,
'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);