moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-63130_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-09-11 23:56:33 +02:00
commit d05c1e47db
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
message/lib.php
View file

@ -88,11 +88,14 @@ function message_count_unread_messages($user1=null, $user2=null) {
ON (mua.messageid = m.id AND mua.userid = ? AND (mua.action = ? OR mua.action = ?))
WHERE mua.id is NULL
AND mcm.userid = ?";
$params = [$user1->id, \core_message\api::MESSAGE_ACTION_DELETED, \core_message\api::MESSAGE_ACTION_READ, $user1->id];
$params = [$user1->id, \core_message\api::MESSAGE_ACTION_DELETED, \core_message\api::MESSAGE_ACTION_READ, $user1->id];
if (!empty($user2)) {
$sql .= " AND m.useridfrom = ?";
$params[] = $user2->id;
} else {
$sql .= " AND m.useridfrom <> ?";
$params[] = $user1->id;
}
return $DB->count_records_sql($sql, $params);

12
message/tests/messagelib_test.php
View file

@ -270,6 +270,18 @@ class core_message_messagelib_testcase extends advanced_testcase {
$this->assertEquals(0, message_count_unread_messages($userto, $userfrom1));
}
/**
* Test message_count_unread_messages with sent messages.
*/
public function test_message_count_unread_messages_with_sent_messages() {
$userfrom = $this->getDataGenerator()->create_user();
$userto = $this->getDataGenerator()->create_user();
$this->send_fake_message($userfrom, $userto);
$this->assertEquals(0, message_count_unread_messages($userfrom));
}
/**
* Test message_add_contact.
*/