From 4f6cb2ee77945321625ce0e9ed634a835d7d323c Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Mon, 11 Jun 2018 18:05:12 +0800
Subject: [PATCH] MDL-62658 message_popup: fixed issue with malformed URL being
 generated

---
 .../notification_popover_controller.min.js    | Bin 5123 -> 5123 bytes
 .../src/notification_popover_controller.js    |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/message/output/popup/amd/build/notification_popover_controller.min.js b/message/output/popup/amd/build/notification_popover_controller.min.js
index 3ce78cb5e755dd57482a5c31580919e474e364a1..b241a56f097afa4eee4a2ad82bd8975c9de5e337 100644
GIT binary patch
delta 20
bcmZqHXx7+Z$2IvPr^sYGE{V-qTr)WVNiznF

delta 42
vcmZqHXx7+Z$0b>mnvz+Rnp{#^lw*~omz<whl3D@c=uE!IDZDw0YbGZEP6H35

diff --git a/message/output/popup/amd/src/notification_popover_controller.js b/message/output/popup/amd/src/notification_popover_controller.js
index 9ffc65d5716..9aa763045a2 100644
--- a/message/output/popup/amd/src/notification_popover_controller.js
+++ b/message/output/popup/amd/src/notification_popover_controller.js
@@ -224,8 +224,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str', 'core/url',
 
             // Link to mark read page before loading the actual link.
             notification.contexturl = URL.relativeUrl('message/output/popup/mark_notification_read.php', {
-                redirecturl: notification.contexturl,
                 notificationid: notification.id,
+                redirecturl: notification.contexturl
             });
 
             var promise = Templates.render('message_popup/notification_content_item', notification)
-- 
2.17.1