From 132bbede2b5ca5e1bbb371bdaef0bb3041c67316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 18 Apr 2012 15:35:09 +0200
Subject: [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
---
 phpBB/includes/template/filter.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index f3e0f6017c..50882b2855 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -877,8 +877,16 @@ class phpbb_template_filter extends php_user_filter
 	{
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
-			// do something
-			var_dump($tag_args);
+			// The hook location is wrongly formatted,
+			// if the `DEBUG` constant is set then trigger a waring,
+			// otherwise drop the hook and continue
+			if (defined('DEBUG'))
+			{
+				global $user;
+				trigger_error($user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_NOTICE);
+			}
+
+			return;
 		}
 		$location = $tag_args;
 
-- 
cgit v1.2.1