From c210455a4c99fe2faf1cd464cd02558fbff9d3a0 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Mon, 25 Mar 2019 12:39:59 +0800
Subject: [PATCH] MDL-64017 core: remove group conversation check for
 processors

We now want to allow processors to process group messages.
---
 lib/classes/message/manager.php | 3 +--
 lib/tests/messagelib_test.php   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/classes/message/manager.php b/lib/classes/message/manager.php
index dc688f95207..bf85477df56 100644
--- a/lib/classes/message/manager.php
+++ b/lib/classes/message/manager.php
@@ -202,10 +202,9 @@ class manager {
             }
 
             // Fill in the array of processors to be used based on default and user preferences.
-            // This applies only to individual conversations. Messages to group conversations ignore processors.
             // Do not process muted conversations.
             $processorlist = [];
-            if ($conv->type == \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL && !$recipient->ismuted) {
+            if (!$recipient->ismuted) {
                 foreach ($processors as $processor) {
                     // Skip adding processors for internal user, if processor doesn't support sending message to internal user.
                     if (!$usertoisrealuser && !$processor->object->can_send_to_any_users()) {
diff --git a/lib/tests/messagelib_test.php b/lib/tests/messagelib_test.php
index 489a4852978..7faf33d5462 100644
--- a/lib/tests/messagelib_test.php
+++ b/lib/tests/messagelib_test.php
@@ -867,11 +867,11 @@ class core_messagelib_testcase extends advanced_testcase {
         set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user2);
         set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user3);
 
-        // Now, send a message and verify the email processor is NOT hit.
+        // Now, send a message and verify the email processor are hit.
         $sink = $this->redirectEmails();
         $messageid = message_send($message);
         $emails = $sink->get_messages();
-        $this->assertCount(0, $emails);
+        $this->assertCount(2, $emails);
 
         // Verify the record was created in 'messages'.
         $recordexists = $DB->record_exists('messages', ['id' => $messageid]);
@@ -952,7 +952,7 @@ class core_messagelib_testcase extends advanced_testcase {
         $transaction->allow_commit();
         $events = $eventsink->get_events();
         $emails = $sink->get_messages();
-        $this->assertCount(0, $emails); // Email processor is disabled for messages to group conversations.
+        $this->assertCount(2, $emails);
         $this->assertCount(1, $events);
         $this->assertInstanceOf('\core\event\group_message_sent', $events[0]);
     }