1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

[ticket/12509] Fix the call to set_custom_file in adm/index and messenger

PHPBB3-12509
This commit is contained in:
Tristan Darricau
2014-05-13 23:39:42 +02:00
parent 910b9b59b3
commit 1e427fa031
3 changed files with 19 additions and 7 deletions

View File

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