Merge branch 'MDL-65134-master' of git://github.com/peterRd/moodle

moodle · May 3, 2019 · 41ec008 · 41ec008
2 parents 370acc3 + 9be6dc2
commit 41ec008
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 90 deletions.
diff --git a/message/amd/build/message_drawer_view_conversation.min.js b/message/amd/build/message_drawer_view_conversation.min.js
diff --git a/message/amd/build/message_drawer_view_overview_section.min.js b/message/amd/build/message_drawer_view_overview_section.min.js
diff --git a/message/amd/src/message_drawer_view_conversation.js b/message/amd/src/message_drawer_view_conversation.js
@@ -252,13 +252,13 @@ function(
             messages: state.messages.map(function(message) {
                 return $.extend({}, message);
             }),
-            members: Object.keys(state.members).reduce(function(carry, id) {
-                carry[id] = $.extend({}, state.members[id]);
-                carry[id].contactrequests = state.members[id].contactrequests.map(function(request) {
+            members: Object.keys(state.members).map(function(id) {
+                var formattedMember = $.extend({}, state.members[id]);
+                formattedMember.contactrequests = state.members[id].contactrequests.map(function(request) {
                     return $.extend({}, request);
                 });
-                return carry;
-            }, {})
+                return formattedMember;
+            })
         };
     };