mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #881 from Fyorl/ticket/10970

Browse Source 
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
This commit is contained in:
Nils Adermann
2012-11-10 07:46:50 -08:00
parent 3f933c6870 a05f354fdf
commit f0cfae1f01
11 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/template/template.php
View File

@@ -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)
{