From 1e427fa031eea8dd6a1e04f1407f996d1d948203 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 13 May 2014 23:39:42 +0200 Subject: [ticket/12509] Fix the call to set_custom_file in adm/index and messenger PHPBB3-12509 --- phpBB/phpbb/template/twig/twig.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index 9e5a572cb5..a084245918 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -236,10 +236,18 @@ class twig extends \phpbb\template\base foreach ($names as $template_dir) { - if (is_array($template_dir) && isset($template_dir['ext_path'])) + if (is_array($template_dir)) { - $ext_style_template_path = $ext_path . $template_dir['ext_path']; - $ext_style_path = dirname($ext_style_template_path); + if (isset($template_dir['ext_path'])) + { + $ext_style_template_path = $ext_path . $template_dir['ext_path']; + $ext_style_path = dirname($ext_style_template_path); + } + else + { + $ext_style_path = $ext_path . 'styles/' . $template_dir['name'] . '/'; + $ext_style_template_path = $ext_style_path . 'template/'; + } } else { -- cgit v1.2.1