aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorErik Frèrejean <erikfrerejean@phpbb.com>2012-04-18 15:35:09 +0200
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-17 16:39:58 -0500
commit132bbede2b5ca5e1bbb371bdaef0bb3041c67316 (patch)
tree3aa89c1ebe99ae4674718a8dfeef9059a8a87b8a /phpBB/language/en
parentdb688c2574fd536e1c5f19ed8797d762713c7b6b (diff)
downloadforums-132bbede2b5ca5e1bbb371bdaef0bb3041c67316.tar
forums-132bbede2b5ca5e1bbb371bdaef0bb3041c67316.tar.gz
forums-132bbede2b5ca5e1bbb371bdaef0bb3041c67316.tar.bz2
forums-132bbede2b5ca5e1bbb371bdaef0bb3041c67316.tar.xz
forums-132bbede2b5ca5e1bbb371bdaef0bb3041c67316.zip
[feature/template-events] Handle incorrect template event identifiers
If the template event identifier is wrongly formatted phpBB will triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise the location is ignored. PHPBB3-9550
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7ce3b5d2e6..5fc1b21e4f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -186,6 +186,7 @@ $lang = array_merge($lang, array(
'ERR_CONNECTING_SERVER' => 'Error connecting to the server.',
'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
+ 'ERR_TEMPLATE_EVENT_LOCATION' => 'The specified template event location <em>[%s]</em> is wrongly formatted.',
'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.',
'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.',
'ERR_WATCHING' => 'An error occured while trying to subscribe.',