makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10970] Added missing initialisations and modified the regex

Browse source 
Non-existent variables now become empty strings.

PHPBB3-10970
This commit is contained in:
Fyorl 2012-07-24 11:54:46 +01:00
parent d0cb5bb093
commit 47c67b6d02
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/template/filter.php
View file

@ -375,10 +375,13 @@ class phpbb_template_filter extends php_user_filter
{
$matches = array();
$replace = array();
$vars = array();
$is_expr = true;
preg_match_all('/{[^}]+}/', $path, $matches);
preg_match_all('#\{((?:' . self::REGEX_NS . '\.)*)(\$)?(' . self::REGEX_VAR . ')\}#', $path, $matches);
foreach ($matches[0] as $var_str)
{
$tmp_is_expr = false;
$var = $this->get_varref($var_str, $tmp_is_expr);
$is_expr = $is_expr && $tmp_is_expr;
$vars[] = "isset($var)";
@ -387,7 +390,7 @@ class phpbb_template_filter extends php_user_filter
if (!$is_expr)
{
return ' if (' . implode(' && ', $vars) . ") { \$_template->$include_type('" . str_replace($matches[0], $replace, $path) . "', true); }";
return " \$_template->$include_type('" . str_replace($matches[0], $replace, $path) . "', true);";
}
else
{