diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-10 07:46:50 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-10 07:46:50 -0800 |
| commit | f0cfae1f014e5defd373bac74b5d915fc3568c7a (patch) | |
| tree | 04f0c8ef151c7e8e0d7adf2452624c24c4a71dd8 /tests/template/templates | |
| parent | 3f933c6870188d0e47e186fddfdc4f3b56a57009 (diff) | |
| parent | a05f354fdf903d00e85d8e4ad1d50f9ef906534d (diff) | |
| download | forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.gz forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.bz2 forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.tar.xz forums-f0cfae1f014e5defd373bac74b5d915fc3568c7a.zip | |
Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
Diffstat (limited to 'tests/template/templates')
| -rw-r--r-- | tests/template/templates/include_variables.html | 1 | ||||
| -rw-r--r-- | tests/template/templates/includejs.html | 5 | ||||
| -rw-r--r-- | tests/template/templates/includephp_variables.html | 2 | ||||
| -rw-r--r-- | tests/template/templates/subdir/parent_only.js | 0 | ||||
| -rw-r--r-- | tests/template/templates/subdir/subsubdir/parent_only.js | 0 | ||||
| -rw-r--r-- | tests/template/templates/subdir/variable.html | 1 |
6 files changed, 8 insertions, 1 deletions
diff --git a/tests/template/templates/include_variables.html b/tests/template/templates/include_variables.html new file mode 100644 index 0000000000..8371a061b5 --- /dev/null +++ b/tests/template/templates/include_variables.html @@ -0,0 +1 @@ +<!-- INCLUDE {SUBDIR}/variable.html --> diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html index 8a2587d76b..ef73700eeb 100644 --- a/tests/template/templates/includejs.html +++ b/tests/template/templates/includejs.html @@ -2,4 +2,7 @@ <!-- INCLUDEJS {PARENT} --> <!-- DEFINE $TEST = 'child_only.js' --> <!-- INCLUDEJS {$TEST} --> -{SCRIPTS}
\ No newline at end of file +<!-- INCLUDEJS subdir/{PARENT} --> +<!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} --> +<!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} --> +{SCRIPTS} diff --git a/tests/template/templates/includephp_variables.html b/tests/template/templates/includephp_variables.html new file mode 100644 index 0000000000..6106efc86a --- /dev/null +++ b/tests/template/templates/includephp_variables.html @@ -0,0 +1,2 @@ +Path includes variables. +<!-- INCLUDEPHP ../tests/template/{TEMPLATES}/_dummy_include.php.inc --> diff --git a/tests/template/templates/subdir/parent_only.js b/tests/template/templates/subdir/parent_only.js new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/templates/subdir/parent_only.js diff --git a/tests/template/templates/subdir/subsubdir/parent_only.js b/tests/template/templates/subdir/subsubdir/parent_only.js new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/templates/subdir/subsubdir/parent_only.js diff --git a/tests/template/templates/subdir/variable.html b/tests/template/templates/subdir/variable.html new file mode 100644 index 0000000000..f68f91597c --- /dev/null +++ b/tests/template/templates/subdir/variable.html @@ -0,0 +1 @@ +{VARIABLE} |