diff options
| -rw-r--r-- | phpBB/language/en/email/forum_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/newtopic_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/topic_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/posting.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/viewtopic_body.html | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index 9cb224bfb6..f9ded9edf3 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -5,7 +5,7 @@ Hello {USERNAME}, You are receiving this email because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic. -{U_TOPIC} +{U_NEWEST_POST} If you no longer wish to watch this forum you can either click the "Stop watching this forum link" found at the bottom of the forum above, or by clicking the following link: diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index deb6313d56..4977f82cd7 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -1,7 +1,7 @@ Subject: New Topic Notification - {FORUM_NAME} Charset: iso-8859-1 -Hello, +Hello {USERNAME}, You are receiving this email because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum. diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 27ad2b5541..274fe0995a 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -1,7 +1,7 @@ Subject: Topic Reply Notification - {TOPIC_TITLE} Charset: iso-8859-1 -Hello, +Hello {USERNAME}, You are receiving this email because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. diff --git a/phpBB/posting.php b/phpBB/posting.php index 159e8a6fed..0b435adab2 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1211,6 +1211,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id $messenger->assign_vars(array( 'EMAIL_SIG' => $email_sig, 'SITENAME' => $config['sitename'], + 'USERNAME' => $addr['name'], 'TOPIC_TITLE' => $topic_title, 'FORUM_NAME' => $forum_name, diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index c0dea66295..96b1ba9fec 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -46,7 +46,7 @@ <td class="cat" colspan="2"><table width="100%" cellspacing="0"> <tr> <td class="nav" nowrap="nowrap"> - <!-- IF S_WATCH_TOPIC -->{S_WATCH_TOPIC}<!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> + <!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> <!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a><!-- IF U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> <!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- IF U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF --> <!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF --> |