From bab2ec4664c77c9541a52e1f1580179704364589 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Thu, 29 Sep 2016 03:47:04 +0000
Subject: [PATCH] MDL-56292 message: fix param in notificationpreferences.php

---
 lib/navigationlib.php               |  2 +-
 lib/outputrenderers.php             |  2 +-
 message/notificationpreferences.php | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 4f3e058ee7f..b6ebf72769d 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -4536,7 +4536,7 @@ class settings_navigation extends navigation_node {
         if (($currentuser && has_capability('moodle/user:editownmessageprofile', $systemcontext)) || (!isguestuser($user) &&
                 has_capability('moodle/user:editmessageprofile', $usercontext) && !is_primary_admin($user->id))) {
             $messagingurl = new moodle_url('/message/edit.php', array('id' => $user->id));
-            $notificationsurl = new moodle_url('/message/notificationpreferences.php', array('id' => $user->id));
+            $notificationsurl = new moodle_url('/message/notificationpreferences.php', array('userid' => $user->id));
             $useraccount->add(get_string('messagepreferences', 'message'), $messagingurl, self::TYPE_SETTING);
             $useraccount->add(get_string('notificationpreferences', 'message'), $notificationsurl, self::TYPE_SETTING);
         }
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 63b97794fd7..af2379926d1 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -3206,7 +3206,7 @@ EOD;
             $context = [
                 'userid' => $USER->id,
                 'urls' => [
-                    'preferences' => (new moodle_url('/message/notificationpreferences.php', ['id' => $USER->id]))->out(),
+                    'preferences' => (new moodle_url('/message/notificationpreferences.php', ['userid' => $USER->id]))->out(),
                 ],
             ];
             return $this->render_from_template('message/notification_popover', $context);
diff --git a/message/notificationpreferences.php b/message/notificationpreferences.php
index 322a913c586..9a6ac52563f 100644
--- a/message/notificationpreferences.php
+++ b/message/notificationpreferences.php
@@ -26,14 +26,9 @@ require_once(__DIR__ . '/../config.php');
 require_once($CFG->dirroot . '/message/lib.php');
 require_once($CFG->dirroot . '/user/lib.php');
 
-$userid = optional_param('id', 0, PARAM_INT);    // User id.
-
-if (!$userid) {
-    $userid = $USER->id;
-}
-
+$userid = optional_param('userid', $USER->id, PARAM_INT);    // User id.
 $url = new moodle_url('/message/notificationpreferences.php');
-$url->param('id', $userid);
+$url->param('userid', $userid);
 
 $PAGE->set_url($url);
 
@@ -43,9 +38,7 @@ if (isguestuser()) {
     print_error('guestnoeditmessage', 'message');
 }
 
-if (!$user = $DB->get_record('user', array('id' => $userid))) {
-    print_error('invaliduserid');
-}
+$user = $DB->get_record('user', array('id' => $userid), '*', MUST_EXIST);
 
 $systemcontext   = context_system::instance();
 $personalcontext = context_user::instance($user->id);