From ff038e4bae6ee37bfe385a43f9495a3385373606 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@moodle.com>
Date: Thu, 8 Mar 2012 14:45:45 +0700
Subject: [PATCH] MDL-28187 message: fixed up $PAGE->set_url() in
 /message/index.php so the nav highlighted properly

---
 message/edit.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/message/edit.php b/message/edit.php
index 9cabdc2537c..c0b2cb45afd 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -30,12 +30,9 @@ $course = optional_param('course', SITEID, PARAM_INT);   // course id (defaults
 $disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications
 
 $url = new moodle_url('/message/edit.php');
-if ($userid !== $USER->id) {
-    $url->param('id', $userid);
-}
-if ($course != SITEID) {
-    $url->param('course', $course);
-}
+$url->param('id', $userid);
+$url->param('course', $course);
+
 $PAGE->set_url($url);
 
 if (!$course = $DB->get_record('course', array('id' => $course))) {