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 /phpBB/includes/template/template.php | |
| 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 'phpBB/includes/template/template.php')
| -rw-r--r-- | phpBB/includes/template/template.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 5d3ce4c82b..36d7bc5307 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -538,7 +538,11 @@ class phpbb_template // Locate file if ($locate) { - $file = $this->locator->get_first_file_location(array($file), true, true); + $located = $this->locator->get_first_file_location(array($file), false, true); + if ($located) + { + $file = $located; + } } else if ($relative) { |