mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Monllao 2016-10-17 15:29:13 +08:00
commit 0998896e9e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
message/classes/output/messagearea/message_area.php
View File

@ -85,10 +85,8 @@ class message_area implements templatable, renderable {
$data->userid = $this->userid;
$contacts = new contacts($this->otheruserid, $this->contacts);
$data->contacts = $contacts->export_for_template($output);
if ($this->messages) {
$messages = new messages($this->userid, $this->otheruserid, $this->messages);
$data->messages = $messages->export_for_template($output);
}
$messages = new messages($this->userid, $this->otheruserid, $this->messages);
$data->messages = $messages->export_for_template($output);
$data->isconversation = true;
$data->requestedconversation = $this->requestedconversation;

2
message/index.php
View File

@ -117,7 +117,7 @@ if (!$user2realuser) {
// Mark the conversation as read.
if (!empty($user2->id)) {
if ($currentuser) {
if ($currentuser && isset($conversations[$user2->id])) {
// Mark the conversation we are loading as read.
\core_message\api::mark_all_read_for_user($user1->id, $user2->id);
// Ensure the UI knows it's read as well.