mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop

Browse Source 
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
This commit is contained in:
Andreas Fischer
2011-09-27 20:24:16 +02:00
parent d01c028c1c fd376dfbe6
commit af66fbb93b
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/includes/template/filter.php
View File

@@ -873,6 +873,15 @@ class phpbb_template_filter extends php_user_filter
// Strip the trailing period.
$namespace = substr($namespace, 0, -1);
if (($pos = strrpos($namespace, '.')) !== false)
{
$local_namespace = substr($namespace, $pos + 1);
}
else
{
$local_namespace = $namespace;
}
$expr = true;
// S_ROW_COUNT is deceptive, it returns the current row number now the number of rows
@@ -881,23 +890,23 @@ class phpbb_template_filter extends php_user_filter
{
case 'S_ROW_NUM':
case 'S_ROW_COUNT':
$varref = "\$_${namespace}_i";
$varref = "\$_${local_namespace}_i";
break;
case 'S_NUM_ROWS':
$varref = "\$_${namespace}_count";
$varref = "\$_${local_namespace}_count";
break;
case 'S_FIRST_ROW':
$varref = "(\$_${namespace}_i == 0)";
$varref = "(\$_${local_namespace}_i == 0)";
break;
case 'S_LAST_ROW':
$varref = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
$varref = "(\$_${local_namespace}_i == \$_${local_namespace}_count - 1)";
break;
case 'S_BLOCK_NAME':
$varref = "'$namespace'";
$varref = "'$local_namespace'";
break;
default: