diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 22:56:54 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 22:56:54 -0500 |
| commit | bcb1392351c2da921f477b56ab2c0777e7bbf4fc (patch) | |
| tree | 154c1f820f4c9ef7197d04cee4b8ed1db599c874 /tests/template/templates | |
| parent | 65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0 (diff) | |
| parent | 12ede5f2a783bbdb8dc8ba9a94b4cd1ffa750e49 (diff) | |
| download | forums-bcb1392351c2da921f477b56ab2c0777e7bbf4fc.tar forums-bcb1392351c2da921f477b56ab2c0777e7bbf4fc.tar.gz forums-bcb1392351c2da921f477b56ab2c0777e7bbf4fc.tar.bz2 forums-bcb1392351c2da921f477b56ab2c0777e7bbf4fc.tar.xz forums-bcb1392351c2da921f477b56ab2c0777e7bbf4fc.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
[ticket/11828] Fix greedy operators in lexer
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[ticket/develop/11832] Fix path detection
[feature/oauth] Fix tabindex
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
[ticket/11829] Use report_closed to determine status in MCP report_details
[feature/oauth] Fix bug on ucp_auth_link related to error display
[feature/oauth] More small fixes
[feature/oauth] More minor changes from review
[feature/oauth] Fix small bug introduced by update in OAuth library
[feature/oauth] Fix small issues on ucp pages
[feature/oauth] Fix typo in OAuth logout method
[feature/oauth] Make token storage service ignorant
[feature/oauth] Update oauth::logout() to use clearAllTokens()
[feature/oauth] Update storage implementation due to inteface change
[feature/oauth] Update lusitanian/oauth to stable branch
[ticket/11822] Use namespace lookup order for asset loading
[feature/oauth] Update comment on oauth service exception
[feature/oauth] Forgot to remove placeholder comment
...
Conflicts:
phpBB/phpbb/template/twig/lexer.php
tests/template/template_test.php
Diffstat (limited to 'tests/template/templates')
| -rw-r--r-- | tests/template/templates/define.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html index 8405ea55fb..bc20c02ed1 100644 --- a/tests/template/templates/define.html +++ b/tests/template/templates/define.html @@ -25,3 +25,4 @@ $VALUE == 'abc' {$VALUE} <!-- DEFINE $VALUE = '' --> [{$VALUE}] +<!-- DEFINE $TEST -->foobar<!-- ENDDEFINE -->|{$TEST}| |