mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 10:40:28 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.0.12' into develop-olympus

Browse Source 
* prep-release-3.0.12:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
This commit is contained in:
Andreas Fischer
2013-09-02 12:30:10 +02:00
parent fe12093ddf 5ab378f1ee
commit 68555d2d51
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/email/forum_notify.txt
View File

@@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}"
Hello {USERNAME},
You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
{U_NEWEST_POST}