diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-27 17:39:08 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-27 17:39:08 +0200 |
| commit | fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04 (patch) | |
| tree | 72b56ee01d74483a507722ca36be012b2e7e96e5 /phpBB/includes | |
| parent | 5e768036f773e461283d0f65841d2ff0618ec7b7 (diff) | |
| parent | 1f140130930e40dcf3e6693feb1b53d14e46d098 (diff) | |
| download | forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar.gz forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar.bz2 forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.tar.xz forums-fd376dfbe6cd491dae5f6a67edd2bb69aeee3c04.zip | |
Merge remote-tracking branch 'github-cs278/ticket/10392' into develop
* github-cs278/ticket/10392:
[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.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/template/filter.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php index f24c3f4d09..da2cffe64f 100644 --- a/phpBB/includes/template/filter.php +++ b/phpBB/includes/template/filter.php @@ -872,6 +872,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 @@ -880,23 +889,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: |