Use ->getSafeImageTag() in emails

see #3864

diff --git a/com.woltlab.wcf/templates/email_notification_article.tpl b/com.woltlab.wcf/templates/email_notification_article.tpl
index ec29d0ffe0b22814bea05281a1d0313852360126..f09403dcc44b0950b818db587140ac77eac713f3 100644 (file)
--- 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 595d7a2b1ef8dd0e0fca58dbe004c755d86067ee..7ab3fc561ac603fc2d0faf9149f87106888e265d 100644 (file)
--- 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 6f21f85bbe71f5c99509fd3545857f0799bf19b3..eb30d23843b5fabe57a7dbc1df5ee6772a2805a7 100644 (file)
--- 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 6f21f85bbe71f5c99509fd3545857f0799bf19b3..eb30d23843b5fabe57a7dbc1df5ee6772a2805a7 100644 (file)
--- 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 afcfff1e638c842d50ea61cf1915321b3fd485c6..bf1bfe60babc796db232babd283e02891a6d1e85 100644 (file)
--- 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 7939599e260aea62425d7a5fe45f4d42429a60ec..393e94961b2ef95e432db0934bf2e45c17886ed9 100644 (file)
--- 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 c985ee9644d087313a357373eb3f025c4ec0d667..3ac60b4105920f04052cbd7a94ab6ce9a83d3d91 100644 (file)
--- 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 38dd7b5559b58fd03a3d9ca22a404c2418fee76e..0bb7e0d5b849763220cab9e0d8b39fe92070e390 100644 (file)
--- 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>