aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-03-16 00:54:09 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-17 16:39:57 -0500
commitbdbb382a26efb4194e2eb1b6ee5f3913829fc9d1 (patch)
tree29c79e16008864f513090a25620b7a0226e98efc /phpBB/includes/template
parenta6c7fbc59d02ed44ef90e340c4f957a8c5ac9ca5 (diff)
downloadforums-bdbb382a26efb4194e2eb1b6ee5f3913829fc9d1.tar
forums-bdbb382a26efb4194e2eb1b6ee5f3913829fc9d1.tar.gz
forums-bdbb382a26efb4194e2eb1b6ee5f3913829fc9d1.tar.bz2
forums-bdbb382a26efb4194e2eb1b6ee5f3913829fc9d1.tar.xz
forums-bdbb382a26efb4194e2eb1b6ee5f3913829fc9d1.zip
[feature/template-events] Invoke template hooks that are template-specific.
PHPBB3-9550
Diffstat (limited to 'phpBB/includes/template')
-rw-r--r--phpBB/includes/template/filter.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index eca9a0d48c..a158dd4074 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -892,6 +892,13 @@ class phpbb_template_filter extends php_user_filter
->extension_directory("/styles/all/template")
->get_files();
+ $files = array_merge($files, $finder
+ ->extension_prefix($location)
+ ->extension_suffix('.html')
+ // XXX is this safe?
+ ->extension_directory("/styles/" . $this->template_name . "/template")
+ ->get_files());
+
$all_compiled = '';
foreach ($files as $file)
{