diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-08-28 13:30:48 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-08-28 13:30:48 -0500 |
| commit | 68ed2b603556dd509172a2c061622ded693e88db (patch) | |
| tree | 5424c5e3d4dd6d451e9971e905f6026ac0372479 /tests/template/templates/include_loop.html | |
| parent | 57bc3c7d3aaa66fc66798bc1e60b88ae17b110a9 (diff) | |
| parent | dcf82d9a5ae26de462687325b4d8553e4aaca7d4 (diff) | |
| download | forums-68ed2b603556dd509172a2c061622ded693e88db.tar forums-68ed2b603556dd509172a2c061622ded693e88db.tar.gz forums-68ed2b603556dd509172a2c061622ded693e88db.tar.bz2 forums-68ed2b603556dd509172a2c061622ded693e88db.tar.xz forums-68ed2b603556dd509172a2c061622ded693e88db.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
[ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
[ticket/11799] Send anti abuse headers in "new password" emails.
[ticket/11792] Add functional test for var lang_set_ext of core.user_setup
[ticket/11804] Remove </li> from overall_header which was not open
[ticket/11802] replace $browser with $user->browser
[ticket/11801] removed some whitespace and added missing semi colon's in css
[ticket/11792] Add performance remark to core.user_setup event PHPDoc
[ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
[ticket/11789] Remove inline color in memberlist_view
[ticket/11800] Fix scripts variable in subsilver simple_footer
[ticket/11800] Fix JavaScript in simple_footer.html
[ticket/11800] Remove forum_fn from memberlist_search.html
[ticket/11796] Replace pagination with pagination.html
[ticket/11794] Add missing array element commas to docs/coding-guidelines.html
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11789] Remove colors from HTML code
[ticket/11784] Remove naming redundancy for event listeners
[ticket/11775] Split test into multiple steps
[ticket/11777] Fix new test for loop variables in extension template listeners
...
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
Diffstat (limited to 'tests/template/templates/include_loop.html')
| -rw-r--r-- | tests/template/templates/include_loop.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/template/templates/include_loop.html b/tests/template/templates/include_loop.html index d5c3d9bc82..5cad34b363 100644 --- a/tests/template/templates/include_loop.html +++ b/tests/template/templates/include_loop.html @@ -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 --> |