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

[ticket/10392] Fix access to nested special block variables.

Browse source 
PHPBB3-10392
This commit is contained in:
Chris Smith 2011-09-26 20:52:07 +01:00
parent 5e768036f7
commit 0f589d9ce4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -871,6 +871,8 @@ class phpbb_template_filter extends php_user_filter
{ {
// Strip the trailing period. // Strip the trailing period.
$namespace = substr($namespace, 0, -1); $namespace = substr($namespace, 0, -1);
$local_namespace = substr(strrchr($namespace, '.'), 1);
$local_namespace = ($local_namespace) ? $local_namespace : $namespace;
$expr = true; $expr = true;
@ -880,19 +882,19 @@ class phpbb_template_filter extends php_user_filter
{ {
case 'S_ROW_NUM': case 'S_ROW_NUM':
case 'S_ROW_COUNT': case 'S_ROW_COUNT':
$varref = "\$_${namespace}_i"; $varref = "\$_${local_namespace}_i";
break; break;
case 'S_NUM_ROWS': case 'S_NUM_ROWS':
$varref = "\$_${namespace}_count"; $varref = "\$_${local_namespace}_count";
break; break;
case 'S_FIRST_ROW': case 'S_FIRST_ROW':
$varref = "(\$_${namespace}_i == 0)"; $varref = "(\$_${local_namespace}_i == 0)";
break; break;
case 'S_LAST_ROW': case 'S_LAST_ROW':
$varref = "(\$_${namespace}_i == \$_${namespace}_count - 1)"; $varref = "(\$_${local_namespace}_i == \$_${local_namespace}_count - 1)";
break; break;
case 'S_BLOCK_NAME': case 'S_BLOCK_NAME':