mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-19 06:51:33 +02:00
[ticket/11701] Fix loops var check
PHPBB3-11701
This commit is contained in:
committed by
Nathan Guse
parent
0d31420ae0
commit
c0b9db1c62
@@ -1,4 +1,4 @@
|
||||
<!-- BEGIN loop -->
|
||||
<!-- INCLUDE {loop.NESTED_FILE} -->
|
||||
<!-- BEGIN inner -->_<!-- INCLUDE {inner.NESTED_FILE} --><!-- END inner -->
|
||||
<!-- END loop -->
|
||||
<!-- BEGIN test_loop -->
|
||||
<!-- INCLUDE {test_loop.NESTED_FILE} -->
|
||||
<!-- BEGIN inner -->_<!-- INCLUDE {test_loop.inner.NESTED_FILE} --><!-- END inner -->
|
||||
<!-- END test_loop -->
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<!-- BEGIN loop -->
|
||||
<!-- DEFINE $DEF = '{loop.NESTED_FILE}' -->
|
||||
<!-- BEGIN test_loop -->
|
||||
<!-- DEFINE $DEF = '{test_loop.NESTED_FILE}' -->
|
||||
<!-- INCLUDE {$DEF} -->
|
||||
<!-- END loop -->
|
||||
<!-- END test_loop -->
|
||||
|
@@ -1,21 +1,21 @@
|
||||
<!-- BEGIN loop -->
|
||||
<!-- BEGIN test_loop -->
|
||||
loop
|
||||
<!-- BEGINELSE -->
|
||||
noloop
|
||||
<!-- END loop -->
|
||||
<!-- END test_loop -->
|
||||
|
||||
<!-- IF .loop -->
|
||||
<!-- IF .test_loop -->
|
||||
loop
|
||||
<!-- ELSE -->
|
||||
noloop
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF .loop == 2 -->
|
||||
<!-- IF .test_loop == 2 -->
|
||||
loop
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- BEGIN loop -->
|
||||
<!-- BEGIN test_loop -->
|
||||
<!-- BEGIN !block -->
|
||||
loop#{loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
|
||||
loop#{test_loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
|
||||
<!-- END !block -->
|
||||
<!-- END loop -->
|
||||
<!-- END test_loop -->
|
||||
|
@@ -1,19 +1,19 @@
|
||||
<!-- BEGIN loop -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(0) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(0,-1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(1,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(1,1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0,1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(0,1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(2,4) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(2,4) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(0,-7) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(0,-7) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(-2,6) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(-2,6) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
x
|
||||
<!-- BEGIN loop(-2,-1) -->{loop.S_FIRST_ROW}{loop.S_ROW_COUNT}{loop.S_LAST_ROW}<!-- END loop -->
|
||||
<!-- BEGIN test_loop(-2,-1) -->{test_loop.S_FIRST_ROW}{test_loop.S_ROW_COUNT}{test_loop.S_LAST_ROW}<!-- END test_loop -->
|
||||
|
@@ -22,18 +22,18 @@
|
||||
! empty
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF .loop -->
|
||||
<!-- IF .test_loop -->
|
||||
loop
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF .loop == 0 -->
|
||||
<!-- IF .test_loop == 0 -->
|
||||
loop = 0
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- IF ! .loop -->
|
||||
<!-- IF ! .test_loop -->
|
||||
! loop
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- BEGIN loop -->
|
||||
<!-- BEGIN test_loop -->
|
||||
in loop
|
||||
<!-- END loop -->
|
||||
<!-- END test_loop -->
|
||||
|
@@ -1,13 +1,13 @@
|
||||
<!-- BEGIN loop -->
|
||||
<!-- IF loop.S_FIRST_ROW -->first<!-- ENDIF -->
|
||||
{loop.S_ROW_NUM} - a
|
||||
{loop.VARIABLE} - b
|
||||
<!-- IF loop.VARIABLE -->set<!-- ENDIF -->
|
||||
<!-- IF loop.S_LAST_ROW -->
|
||||
<!-- BEGIN test_loop -->
|
||||
<!-- IF test_loop.S_FIRST_ROW -->first<!-- ENDIF -->
|
||||
{test_loop.S_ROW_NUM} - a
|
||||
{test_loop.VARIABLE} - b
|
||||
<!-- IF test_loop.VARIABLE -->set<!-- ENDIF -->
|
||||
<!-- IF test_loop.S_LAST_ROW -->
|
||||
last
|
||||
<!-- ENDIF -->
|
||||
<!-- BEGIN inner -->
|
||||
{inner.S_ROW_NUM} - c
|
||||
<!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
|
||||
{test_loop.inner.S_ROW_NUM} - c
|
||||
<!-- IF test_loop.inner.S_LAST_ROW and test_loop.inner.S_ROW_COUNT and test_loop.inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
|
||||
<!-- END inner -->
|
||||
<!-- END loop -->
|
||||
<!-- END test_loop -->
|
||||
|
Reference in New Issue
Block a user