From cd07b3b5cbdfede6fdf0ced18969536f2ed8e9c2 Mon Sep 17 00:00:00 2001
From: Jake Dallimore <jake@moodle.com>
Date: Wed, 7 Nov 2018 18:17:51 +0800
Subject: [PATCH] MDL-63903 core_message: fix bug with shim code in index.php

On backend render (not via js loading), the following bugs were
introduced:
- Message ordering was wrong
- Message blocktimes were wrong
This patches the above to restore legacy behaviour.
---
 message/index.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/message/index.php b/message/index.php
index 9d30f34e12b..e3f1083e710 100644
--- a/message/index.php
+++ b/message/index.php
@@ -155,7 +155,11 @@ if (!empty($user2->id)) {
     $year = '';
 
     // Parse the messages to add missing fields for backward compatibility.
-    $messages = array_map(function($message) use ($user1, $user2, $USER, $day, $month, $year) {
+    $messages = array_reverse($messages);
+    $day = '';
+    $month = '';
+    $year = '';
+    foreach ($messages as $message) {
         // Add useridto.
         if (empty($message->useridto)) {
             if ($message->useridfrom == $user1->id) {
@@ -168,22 +172,21 @@ if (!empty($user2->id)) {
         // Add currentuserid.
         $message->currentuserid = $USER->id;
 
-        // Add displayblocktime.
+        // Check if we are now viewing a different block period.
+        $message->displayblocktime = false;
         $date = usergetdate($message->timecreated);
         if ($day != $date['mday'] || $month != $date['month'] || $year != $date['year']) {
             $day = $date['mday'];
             $month = $date['month'];
             $year = $date['year'];
             $message->displayblocktime = true;
-        } else {
-            $message->displayblocktime = false;
+            $message->blocktime = userdate($message->timecreated, get_string('strftimedaydate'));
         }
+
         // We don't have this information here so, for now, we leave an empty value.
         // This is a temporary solution because a new UI is being built in MDL-63303.
         $message->timeread = 0;
-
-        return $message;
-    }, $messages);
+    }
 }
 
 $pollmin = !empty($CFG->messagingminpoll) ? $CFG->messagingminpoll : MESSAGE_DEFAULT_MIN_POLL_IN_SECONDS;