From c8a69deba5f05e8d189a1e4310279771dc4036ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 24 Feb 2021 12:01:09 +0100
Subject: [PATCH] Use ->getSafeImageTag() in emails

see #3864
---
 com.woltlab.wcf/templates/email_notification_article.tpl        | 2 +-
 com.woltlab.wcf/templates/email_notification_comment.tpl        | 2 +-
 .../templates/email_notification_commentResponse.tpl            | 2 +-
 .../templates/email_notification_commentResponseOwner.tpl       | 2 +-
 .../templates/email_notification_moderationQueueComment.tpl     | 2 +-
 .../email_notification_moderationQueueCommentResponse.tpl       | 2 +-
 .../templates/email_notification_userFollowFollowing.tpl        | 2 +-
 .../templates/email_notification_userRegistration.tpl           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/templates/email_notification_article.tpl b/com.woltlab.wcf/templates/email_notification_article.tpl
index ec29d0ffe0..f09403dcc4 100644
--- a/com.woltlab.wcf/templates/email_notification_article.tpl
+++ b/com.woltlab.wcf/templates/email_notification_article.tpl
@@ -12,7 +12,7 @@
 	{capture assign='articleContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$article->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$article->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				<div class="containerHeadline">
 					<h3>
diff --git a/com.woltlab.wcf/templates/email_notification_comment.tpl b/com.woltlab.wcf/templates/email_notification_comment.tpl
index 595d7a2b1e..7ab3fc561a 100644
--- a/com.woltlab.wcf/templates/email_notification_comment.tpl
+++ b/com.woltlab.wcf/templates/email_notification_comment.tpl
@@ -15,7 +15,7 @@
 	{capture assign='commentContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				<div class="containerHeadline">
 					<h3>
diff --git a/com.woltlab.wcf/templates/email_notification_commentResponse.tpl b/com.woltlab.wcf/templates/email_notification_commentResponse.tpl
index 6f21f85bbe..eb30d23843 100644
--- a/com.woltlab.wcf/templates/email_notification_commentResponse.tpl
+++ b/com.woltlab.wcf/templates/email_notification_commentResponse.tpl
@@ -15,7 +15,7 @@
 	{capture assign='commentContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				<div class="containerHeadline">
 					<h3>
diff --git a/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl b/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl
index 6f21f85bbe..eb30d23843 100644
--- a/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl
+++ b/com.woltlab.wcf/templates/email_notification_commentResponseOwner.tpl
@@ -15,7 +15,7 @@
 	{capture assign='commentContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				<div class="containerHeadline">
 					<h3>
diff --git a/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl b/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
index afcfff1e63..bf1bfe60ba 100644
--- a/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
+++ b/com.woltlab.wcf/templates/email_notification_moderationQueueComment.tpl
@@ -15,7 +15,7 @@
 	{capture assign='commentContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				<div class="containerHeadline">
 					<h3>
diff --git a/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl b/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
index 7939599e26..393e94961b 100644
--- a/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
+++ b/com.woltlab.wcf/templates/email_notification_moderationQueueCommentResponse.tpl
@@ -15,7 +15,7 @@
 	{capture assign='commentContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$comment->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				<div class="containerHeadline">
 					<h3>
diff --git a/com.woltlab.wcf/templates/email_notification_userFollowFollowing.tpl b/com.woltlab.wcf/templates/email_notification_userFollowFollowing.tpl
index c985ee9644..3ac60b4105 100644
--- a/com.woltlab.wcf/templates/email_notification_userFollowFollowing.tpl
+++ b/com.woltlab.wcf/templates/email_notification_userFollowFollowing.tpl
@@ -12,7 +12,7 @@
 	{capture assign='userContent'}
 	<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+			<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$user->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 			<td class="boxContent">
 				{include file='email_userInformationHeadline'}
 			</td>
diff --git a/com.woltlab.wcf/templates/email_notification_userRegistration.tpl b/com.woltlab.wcf/templates/email_notification_userRegistration.tpl
index 38dd7b5559..0bb7e0d5b8 100644
--- a/com.woltlab.wcf/templates/email_notification_userRegistration.tpl
+++ b/com.woltlab.wcf/templates/email_notification_userRegistration.tpl
@@ -12,7 +12,7 @@
 	{capture assign='userContent'}
 		<table cellpadding="0" cellspacing="0" border="0">
 			<tr>
-				<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag($avatarSize)}</a></td>
+				<td><a href="{link controller='User' object=$user isHtmlEmail=true}{/link}" title="{$user->username}">{@$user->getAvatar()->getSafeImageTag($avatarSize)}</a></td>
 				<td class="boxContent">
 					{include file='email_userInformationHeadline'}
 				</td>
-- 
2.20.1