fixed: deadloop during sending of GroupMail

ColdTrick · Sep 26, 2022 · 4ee1b5d · 4ee1b5d
1 parent 45e6917
commit 4ee1b5d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/classes/GroupMail.php b/classes/GroupMail.php
@@ -21,7 +21,7 @@ protected function initializeAttributes() {
 	 * @return string
 	 */
 	public function getSubject() {
-		return $this->title;
+		return $this->title ?? elgg_echo('group_tools:mail:message:default_subject', [$this->getContainerEntity()->getDisplayName()]);
 	}
 
 	/**
@@ -95,7 +95,7 @@ public function enqueue() {
 			return false;
 		}
 
-		elgg_trigger_event('enqueue', 'object', $this);
+		elgg_trigger_event('enqueue-mail', 'object', $this);
 
 		return true;
 	}

diff --git a/elgg-plugin.php b/elgg-plugin.php
@@ -295,7 +295,7 @@
 		],
 		'object' => [
 			'group_tools_group_mail' => [
-				'enqueue' => GroupMailEnqueueNotificationEventHandler::class,
+				'enqueue-mail' => GroupMailEnqueueNotificationEventHandler::class,
 			],
 		]
 	],

diff --git a/languages/en.php b/languages/en.php
@@ -352,6 +352,7 @@
 	'groups:tool:mail_members' => "Allow group members to mail other group members",
 	'groups:tool:mail_members:description' => "This will allow normal group members to send an e-mail to other group members. By default this is limited to group admins.",
 
+	'group_tools:mail:message:default_subject' => "Notification from the group %s",
 	'group_tools:mail:message:from' => "From group",
 
 	'group_tools:mail:title' => "Send a mail to the group members",

diff --git a/languages/nl.php b/languages/nl.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * This file was created by Translation Editor v10.1.1
- * On 2022-08-18 12:25
+ * This file was created by Translation Editor v11.0
+ * On 2022-09-26 11:59
  */
 
 return array (
+  'group_tools:mail:message:default_subject' => 'Bericht uit de groep %s',
   'groups:tool:group_multiple_admin_allow:description' => 'Laat groepsbeheerders andere groepsbeheerders beheren. Normaal kan alleen de groepseigenaar dit beheren.',
   'groups:tool:related_groups:description' => 'Toon een lijst met gerelateerde groepen aan de leden van deze groep.',
   'group_tools:welcome_message:notifications' => 'Activiteiten binnen deze groep kunnen notificaties versturen.