Fix #173: New message creation notification fails

humhub · Mar 28, 2020 · dec36aa · dec36aa
1 parent e3d7068
commit dec36aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.0.15 - March 28, 2020
+-----------------------
+- Fix #173: New message creation notification fails 
+
 
 1.0.14 - March 17, 2020
 -----------------------

diff --git a/models/forms/CreateMessage.php b/models/forms/CreateMessage.php
@@ -107,6 +107,11 @@ public function save()
                 return false;
             }
 
+            if (!$this->informRecipients()) {
+                $transaction->rollBack();
+                return false;
+            }
+
             if(!$this->saveOriginatorUserMessage()) {
                 $transaction->rollBack();
                 return false;
@@ -128,16 +133,18 @@ public function save()
 
     private function saveRecipients()
     {
-        $recepients = [];
         // Attach also Recipients
         foreach ($this->getRecipients() as $recipient) {
-            if ($this->messageInstance->addRecepient($recipient)) {
-                $recepients[] = $recipient;
-            }
+            $this->messageInstance->addRecepient($recipient);
         }
 
+        return true;
+    }
+
+    private function informRecipients() {
+
         // Inform recipients (We need to add all before)
-        foreach ($recepients as $recipient) {
+        foreach ($this->getRecipients() as $recipient) {
             try {
                 $this->messageInstance->notify($recipient);
             } catch (\Exception $e) {

diff --git a/module.json b/module.json
@@ -3,7 +3,7 @@
     "name": "Mail",
     "description": "A private messaging system for direct communication",
     "keywords": ["mail", "messaging", "communication"],
-    "version": "1.0.14",
+    "version": "1.0.15",
     "humhub": {
         "minVersion": "1.3.3"
     },