From 01ec550b0f13cf1bdd395f6745b2c6f68cdaddea Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 6 Oct 2011 14:19:03 +1300
Subject: [PATCH] MDL-29672 user: Fixed user edit page for non-admin users

---
 user/edit.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/user/edit.php b/user/edit.php
index a8e7138b130..6fa160819e9 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -36,7 +36,7 @@ $userid = optional_param('id', $USER->id, PARAM_INT);    // user id
 $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 @@ if ($course->id != SITEID) {
     }
     redirect(get_login_url());
 } else {
-    $PAGE->set_course($course);
+    $PAGE->set_context(get_system_context());
+    $PAGE->set_pagelayout('standard');
 }
 
 // Guest can not edit