From: Tim Düsterhus
Date: Sat, 18 Jun 2016 11:22:30 +0000 (+0200)
Subject: Convert email notifications for replies to wall comments to new API
X-Git-Tag: 3.0.0_Beta_1~916^2~1^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=885243e1edde653e045ad39d74caf8a9dad59f85;p=GitHub%2FWoltLab%2FWCF.git
Convert email notifications for replies to wall comments to new API
---
diff --git a/com.woltlab.wcf/templates/email_html.tpl b/com.woltlab.wcf/templates/email_html.tpl
index 74027982b4..ffa1a1766e 100644
--- a/com.woltlab.wcf/templates/email_html.tpl
+++ b/com.woltlab.wcf/templates/email_html.tpl
@@ -29,7 +29,12 @@
}
.content {
- padding: 0 20px;
+ padding: 40px 40px 60px;
+ }
+ .header {
+ background-color: {$style->getVariable('wcfHeaderBackground', true)};
+ color: {$style->getVariable('wcfHeaderText', true)};
+ padding: 20px 10px;
}
.footer {
background-color: {$style->getVariable('wcfFooterBackground', true)};
@@ -75,11 +80,16 @@
+ {capture assign='header'}
+ {/capture}
+ {include file='email_paddingHelper' block=true class='header' content=$header sandbox=true}
+
{if $beforeContent|isset}{@$beforeContent}{/if}
-
- {@$content}
-
+
+ {include file='email_paddingHelper' block=true class='content' content=$content sandbox=true}
+
{if $afterContent|isset}{@$afterContent}{/if}
+
{capture assign='footer'}
{hascontent}
--
diff --git a/com.woltlab.wcf/templates/email_notification_userProfileComment.tpl b/com.woltlab.wcf/templates/email_notification_userProfileComment.tpl
index f581ea24d7..48aa878d86 100644
--- a/com.woltlab.wcf/templates/email_notification_userProfileComment.tpl
+++ b/com.woltlab.wcf/templates/email_notification_userProfileComment.tpl
@@ -5,7 +5,7 @@
{lang}wcf.user.notification.comment.mail.html{/lang}
{assign var='user' value=$event->getAuthor()}
{assign var='comment' value=$event->getUserNotificationObject()}
- {capture assign='userContent'}
+ {capture assign='commentContent'}
{/capture}
- {include file='email_paddingHelper' block=true class='box128' content=$userContent sandbox=true}
+ {include file='email_paddingHelper' block=true class='box128' content=$commentContent sandbox=true}
{/if}
diff --git a/com.woltlab.wcf/templates/email_notification_userProfileCommentResponse.tpl b/com.woltlab.wcf/templates/email_notification_userProfileCommentResponse.tpl
new file mode 100644
index 0000000000..f1995a58c0
--- /dev/null
+++ b/com.woltlab.wcf/templates/email_notification_userProfileCommentResponse.tpl
@@ -0,0 +1,32 @@
+{if $mimeType === 'text/plain'}
+{lang}wcf.user.notification.commentResponse.mail.plaintext{/lang}
+{$event->getUserNotificationObject()->message}
+{else}
+ {lang}wcf.user.notification.commentResponse.mail.html{/lang}
+ {assign var='user' value=$event->getAuthor()}
+ {assign var='comment' value=$event->getUserNotificationObject()}
+ {capture assign='commentContent'}
+
+ {/capture}
+ {include file='email_paddingHelper' block=true class='box128' content=$commentContent sandbox=true}
+{/if}
diff --git a/com.woltlab.wcf/templates/email_notification_userProfileCommentResponseOwner.tpl b/com.woltlab.wcf/templates/email_notification_userProfileCommentResponseOwner.tpl
new file mode 100644
index 0000000000..85846ac766
--- /dev/null
+++ b/com.woltlab.wcf/templates/email_notification_userProfileCommentResponseOwner.tpl
@@ -0,0 +1,32 @@
+{if $mimeType === 'text/plain'}
+{lang}wcf.user.notification.commentResponseOwner.mail.plaintext{/lang}
+{$event->getUserNotificationObject()->message}
+{else}
+ {lang}wcf.user.notification.commentResponseOwner.mail.html{/lang}
+ {assign var='user' value=$event->getAuthor()}
+ {assign var='comment' value=$event->getUserNotificationObject()}
+ {capture assign='commentContent'}
+
+ {/capture}
+ {include file='email_paddingHelper' block=true class='box128' content=$commentContent sandbox=true}
+{/if}
diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php
index 2fb86ab1fd..c70a97be2d 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseOwnerUserNotificationEvent.class.php
@@ -97,33 +97,14 @@ class UserProfileCommentResponseOwnerUserNotificationEvent extends AbstractShare
]);
}
- $authors = $this->getAuthors();
- if (count($authors) > 1) {
- if (isset($authors[0])) {
- unset($authors[0]);
- }
- $count = count($authors);
-
- return $this->getLanguage()->getDynamicVariable('wcf.user.notification.commentResponseOwner.mail.stacked', [
- 'author' => $this->author,
- 'authors' => array_values($authors),
+ return [
+ 'template' => 'email_notification_userProfileCommentResponseOwner',
+ 'application' => 'wcf',
+ 'variables' => [
'commentAuthor' => $commentAuthor,
- 'count' => $count,
- 'notificationType' => $notificationType,
- 'others' => $count - 1,
- 'owner' => $owner,
- 'response' => $this->userNotificationObject,
- 'guestTimesTriggered' => $this->notification->guestTimesTriggered
- ]);
- }
-
- return $this->getLanguage()->getDynamicVariable('wcf.user.notification.commentResponseOwner.mail', [
- 'response' => $this->userNotificationObject,
- 'author' => $this->author,
- 'commentAuthor' => $commentAuthor,
- 'owner' => $owner,
- 'notificationType' => $notificationType
- ]);
+ 'owner' => $owner
+ ]
+ ];
}
/**
diff --git a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php
index 5be55669c2..d2ade897b2 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentResponseUserNotificationEvent.class.php
@@ -72,31 +72,13 @@ class UserProfileCommentResponseUserNotificationEvent extends AbstractSharedUser
public function getEmailMessage($notificationType = 'instant') {
$owner = UserProfileRuntimeCache::getInstance()->getObject($this->additionalData['objectID']);
- $authors = $this->getAuthors();
- if (count($authors) > 1) {
- if (isset($authors[0])) {
- unset($authors[0]);
- }
- $count = count($authors);
-
- return $this->getLanguage()->getDynamicVariable('wcf.user.notification.commentResponse.mail.stacked', [
- 'author' => $this->author,
- 'authors' => array_values($authors),
- 'count' => $count,
- 'notificationType' => $notificationType,
- 'others' => $count - 1,
- 'owner' => $owner,
- 'response' => $this->userNotificationObject,
- 'guestTimesTriggered' => $this->notification->guestTimesTriggered
- ]);
- }
-
- return $this->getLanguage()->getDynamicVariable('wcf.user.notification.commentResponse.mail', [
- 'response' => $this->userNotificationObject,
- 'author' => $this->author,
- 'owner' => $owner,
- 'notificationType' => $notificationType
- ]);
+ return [
+ 'template' => 'email_notification_userProfileCommentResponse',
+ 'application' => 'wcf',
+ 'variables' => [
+ 'owner' => $owner
+ ]
+ ];
}
/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b11b239c29..4099c8a7f2 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3289,7 +3289,7 @@ Benachrichtigungen auf {PAGE_TITLE|language
- userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat einen Kommentar an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
- getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{/if} haben Kommentare an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
- getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} hat einen Kommentar an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}] verfasst:]]>
- - {if !$event->getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username}{/if} hat einen Kommentar an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst:
]]>
+ - {if !$event->getAuthor()->userID}ein Gast{else}{$event->getAuthor()->username}{/if} hat einen Kommentar an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst:]]>
- getAnchorTag()} gefällt {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if}.]]>
@@ -3298,14 +3298,8 @@ Benachrichtigungen auf {PAGE_TITLE|language
- userID}Ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an {if $owner->userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} verfasst.]]>
- getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{/if} haben auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar an {if $owner->userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} geantwortet.]]>
- - userID}ein Gast{else}{@$author->username}{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an der Pinnwand von "{@$owner->username}" verfasst:
-{if $notificationType == 'instant'}
----------------------------------
-{@$response->message}
----------------------------------
-{/if}{link controller='User' object=$owner isEmail=true}#wall{/link}]]>
- - username}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {@$authors[2]->username}{/if}{/if}{if $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{else}{@$authors[0]->username}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{/if} haben auf {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Kommentar an {if $owner->userID == $__wcf->getUser()->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if} geantwortet:
-{link controller='User' object=$owner isEmail=true}#wall{/link}]]>
+ - getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} hat eine Antwort {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an{if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {@$notificationContent[variables][owner]->username}{/if} [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}] verfasst:]]>
+ - {if !$event->getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username}{/if} hat eine Antwort zu {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Kommentar an {if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$notificationContent[variables][owner]->username}{/if} verfasst:]]>
- getAnchorTag()} gefällt {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Antwort auf einen Kommentar an {if $owner === null}{if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand{else}der Pinnwand von {$owner->username}{/if}.]]>
@@ -3314,14 +3308,8 @@ Benachrichtigungen auf {PAGE_TITLE|language
- userID}ein Gast{else}{@$author->getAnchorTag()}{/if} hat eine Antwort zum Kommentar von {if $commentAuthor->userID}{$commentAuthor->username}{else}{$commentAuthor->username}{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst.]]>
- getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{/if} haben auf den Kommentar von {if $author->userID}{$author->username}{else}{$author->username}{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand geantwortet.]]>
- - userID}ein Gast{else}{@$author->username}{/if} hat eine Antwort zum Kommentar von "{@$commentAuthor->username}" an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst:
-{if $notificationType == 'instant'}
----------------------------------
-{@$response->message}
----------------------------------
-{/if}{link controller='User' object=$owner isEmail=true}{/link}#wall]]>
- - username}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} und {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} und {else}, {/if} {@$authors[2]->username}{/if}{/if}{if $guestTimesTriggered} und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{else}{@$authors[0]->username}{if $guestTimesTriggered},{else} und{/if} {#$others} weitere Benutzer {if $guestTimesTriggered}und {if $guestTimesTriggered == 1}ein Gast{else}Gäste{/if}{/if}{/if} haben auf den Kommentar von {$author->username} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand geantwortet:
-{link controller='User' object=$owner isEmail=true}{/link}#wall]]>
+ - getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} hat eine Antwort zum Kommentar von {@$notificationContent[variables][commentAuthor]->username}{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}] verfasst:]]>
+ - {if !$event->getAuthor()->userID}ein Gast{else}{$event->getAuthor()->username}{/if} hat eine Antwort zum Kommentar von {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if} an {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} Pinnwand verfasst:]]>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 777b3a6847..40898149a8 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3325,8 +3325,8 @@ If you do not want to receive further email notifications for this event, you ca
- userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a comment on your wall.]]>
- getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} wrote comments on your wall.]]>
- - getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} wrote a comment on your wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}]:]]>
- - {if !$event->getAuthor()->userID}ein Gast{else}{@$event->getAuthor()->username}{/if} wrote a comment your wall:]]>
+ - getAuthor()->userID}A guest{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} wrote a comment on your wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}]:]]>
+ - {if !$event->getAuthor()->userID}A guest{else}{@$event->getAuthor()->username}{/if} wrote a comment your wall:]]>
- getAnchorTag()} likes your comment on {if $owner === null}your wall{else}{$owner->username}âs wall{/if}.]]>
@@ -3335,14 +3335,8 @@ If you do not want to receive further email notifications for this event, you ca
- userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to your comment on {if $owner->userID == $__wcf->getUser()->userID}your{else}{$owner->username}âs{/if} wall.]]>
- getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to your comment on {if $owner->userID == $__wcf->getUser()->userID}your{else}{$owner->username}âs{/if} wall.]]>
- - userID}a guest{else}{@$author->username}{/if} wrote a reply to your comment on {@$owner->username}âs wall:
-{if $notificationType == 'instant'}
----------------------------------
-{@$response->message}
----------------------------------
-{/if}{link controller='User' object=$owner isEmail=true}#wall{/link}]]>
- - username}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->username}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->username}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to your comment on {if $owner->userID == $__wcf->getUser()->userID}your{else}{$owner->username}'s{/if} wall:
-{link controller='User' object=$owner isEmail=true}#wall{/link}]]>
+ - getAuthor()->userID}A guest{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} wrote a reply to your comment on {if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}your{else}{$notificationContent[variables][owner]->username}âs{/if} wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}]:]]>
+ - {if !$event->getAuthor()->userID}A guest{else}{@$event->getAuthor()->username}{/if} wrote a reply to your comment on {if $mailbox->getUser()->userID == $notificationContent[variables][owner]->userID}your{else}{$notificationContent[variables][owner]->username}âs{/if} wall:]]>
- getAnchorTag()} likes your reply to a comment on {if $owner === null}your wall{else}{$owner->username}âs wall{/if}.]]>
@@ -3351,14 +3345,8 @@ If you do not want to receive further email notifications for this event, you ca
- userID}A guest{else}{@$author->getAnchorTag()}{/if} wrote a reply to {$commentAuthor->username}âs comment on your wall.]]>
- getAnchorTag()}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->getAnchorTag()}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->getAnchorTag()}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->getAnchorTag()}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to the comment by {if $author->userID}{$author->username}{else}{$author->username}{/if} on your wall.]]>
- - userID}a guest{else}{@$author->username}{/if} wrote a reply to {@$commentAuthor->username}âs comment on your wall:
-{if $notificationType == 'instant'}
----------------------------------
-{@$response->message}
----------------------------------
-{/if}{link controller='User' object=$owner isEmail=true}#wall{/link}]]>
- - username}{if $count != 1}{if $count == 2 && !$guestTimesTriggered} and {else}, {/if}{@$authors[1]->username}{if $count == 3}{if !$guestTimesTriggered} and {else}, {/if} {@$authors[2]->username}{/if}{/if}{if $guestTimesTriggered} and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{else}{@$authors[0]->username}{if $guestTimesTriggered},{else} and{/if} {#$others} other users {if $guestTimesTriggered}and {if $guestTimesTriggered == 1}a guest{else}guests{/if}{/if}{/if} replied to the comment by {$author->username} on your wall:
-{link controller='User' object=$owner isEmail=true}#wall{/link}]]>
+ - getAuthor()->userID}A guest{else}{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}]{/if} wrote a reply to {@$notificationContent[variables][commentAuthor]->username}âs{if $notificationContent[variables][commentAuthor]->userID} [URL:{link controller='User' object=$notificationContent[variables][commentAuthor] isEmail=true}{/link}]{/if} comment on your wall [URL:{link controller='User' object=$notificationContent[variables][owner] isEmail=true}#wall{/link}]:]]>
+ - {if !$event->getAuthor()->userID}A guest{else}{@$event->getAuthor()->username}{/if} wrote a reply to {if $notificationContent[variables][commentAuthor]->userID}{$notificationContent[variables][commentAuthor]->username}{else}{$notificationContent[variables][commentAuthor]->username}{/if}âs comment on your wall:]]>