mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 09:23:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64128-master' of git://github.com/ryanwyllie/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2018-11-21 14:04:27 +08:00
commit 1d163100ec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
message/amd/build/message_drawer_view_conversation.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
message/amd/src/message_drawer_view_conversation.js
View File

@ -926,8 +926,8 @@ function(
// Search the list of the logged in user's contact requests to find the
// one from this user.
var loggedInUserId = viewState.loggedInUserId;
var requests = viewState.members[loggedInUserId].contactrequests.filter(function(request) {
return request.userid == userId;
var requests = viewState.members[userId].contactrequests.filter(function(request) {
return request.requesteduserid == loggedInUserId;
});
var request = requests[0];
var newState = StateManager.setLoadingConfirmAction(viewState, true);