mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/10322] Separate template varref resolution from output generation

Browse Source 
Most template variables can now have their PHP variable name resolved instead
of only compiling directly. This allows for the use of block vars in INCLUDE
statements. This does not work for language variables since they require
multiple checks. Added tests for the new types of allowed INCLUDEs.

PHPBB3-10322
This commit is contained in:
Patrick Webster
2011-09-16 01:46:42 -05:00
parent b5ecb2f7a8
commit b5a79009ce
8 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/template/templates/include_define.html Normal file
View File

@@ -0,0 +1,2 @@
<!-- DEFINE $DEF = 'variable.html' -->
<!-- INCLUDE {$DEF} -->

4
tests/template/templates/include_loop.html Normal file
View File

@@ -0,0 +1,4 @@
<!-- BEGIN loop -->
<!-- INCLUDE {loop.NESTED_FILE} -->
<!-- BEGIN inner -->_<!-- INCLUDE {inner.NESTED_FILE} --><!-- END inner -->
<!-- END loop -->

1
tests/template/templates/include_loop1.html Normal file
View File

@@ -0,0 +1 @@
1

1
tests/template/templates/include_loop2.html Normal file
View File

@@ -0,0 +1 @@
02

1
tests/template/templates/include_loop3.html Normal file
View File

@@ -0,0 +1 @@
3

2
tests/template/templates/include_variable.html
View File

@@ -1,3 +1 @@
<!-- INCLUDE {FILE} -->
<!-- DEFINE $DEF = 'variable.html' -->
<!-- INCLUDE {$DEF} -->