From 2595087df05c353bcd1c40bbdefcc37277eaf514 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 1 May 2020 17:31:58 +0200
Subject: [PATCH] Fixed encoding in notification emails for moderation queue
 comments

---
 .../templates/email_notification_moderationQueueComment.tpl   | 4 ++--
 .../email_notification_moderationQueueCommentResponse.tpl     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl b/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
index 3d4ac48c58..62efef8d38 100644
--- a/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
+++ b/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
@@ -3,7 +3,7 @@
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
 {lang}{$notificationContent[variables][languageItemPrefix]}.comment.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
 
-{$event->getUserNotificationObject()->message}{/if} {* this line ends with a space *}
+{@$event->getUserNotificationObject()->getMailText($mimeType)}{/if} {* this line ends with a space *}
 {else}
 	{capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.html{/lang}{/capture}
 	{lang}{$notificationContent[variables][languageItemPrefix]}.comment.mail.html{/lang}
@@ -29,7 +29,7 @@
 					</h3>
 				</div>
 				<div>
-					{$comment->message}
+					{@$comment->getMailText($mimeType)}
 				</div>
 			</td>
 		</tr>
diff --git a/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl b/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
index 163d4efcaf..873c5f0f1b 100644
--- a/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
+++ b/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
@@ -3,7 +3,7 @@
 {capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.plaintext{/lang}{/capture}
 {lang}{$notificationContent[variables][languageItemPrefix]}.commentResponse.mail.plaintext{/lang}{if $count == 1 && !$guestTimesTriggered}
 
-{$event->getUserNotificationObject()->message}{/if} {* this line ends with a space *}
+{@$event->getUserNotificationObject()->getMailText($mimeType)}{/if} {* this line ends with a space *}
 {else}
 	{capture assign='authorList'}{lang}wcf.user.notification.mail.authorList.html{/lang}{/capture}
 	{lang}{$notificationContent[variables][languageItemPrefix]}.commentResponse.mail.html{/lang}
@@ -29,7 +29,7 @@
 					</h3>
 				</div>
 				<div>
-					{$comment->message}
+					{@$comment->getMailText($mimeType)}
 				</div>
 			</td>
 		</tr>
-- 
2.20.1