Permalink
Browse files

Merge branch 'wip-MDL-29672-m20' of git://github.com/samhemelryk/mood…

…le into MOODLE_20_STABLE
  • Loading branch information...
2 parents a2f5969 + d86419a commit c868308b89a86449910c8b09be848cf510c9717f @nebgor nebgor committed Oct 10, 2011
Showing with 3 additions and 2 deletions.
  1. +3 −2 user/edit.php
View
@@ -36,7 +36,7 @@
$course = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site)
$cancelemailchange = optional_param('cancelemailchange', 0, PARAM_INT); // course id (defaults to Site)
-$PAGE->set_url('/user/edit.php', array('course'=>$course, 'id'=>$userid, 'cancelemailchange'=>$cancelemailchange));
+$PAGE->set_url('/user/edit.php', array('course'=>$course, 'id'=>$userid));
if (!$course = $DB->get_record('course', array('id'=>$course))) {
print_error('invalidcourseid');
@@ -50,7 +50,8 @@
}
redirect(get_login_url());
} else {
- $PAGE->set_course($course);
+ $PAGE->set_context(get_system_context());
+ $PAGE->set_pagelayout('standard');
}
// Guest can not edit

0 comments on commit c868308

Please sign in to comment.