makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/index.php
View file

@ -51,8 +51,10 @@ $mode = request_var('mode', '');
// Set custom style for admin area // Set custom style for admin area
$template->set_custom_style(array( $template->set_custom_style(array(
array(
'name' => 'adm', 'name' => 'adm',
'ex_path' => 'adm/', 'ex_path' => 'adm/',
)
), $phpbb_admin_path . 'style'); ), $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');

2
phpBB/includes/functions_messenger.php
View file

@ -253,8 +253,10 @@ class messenger
} }
$this->set_template_paths(array( $this->set_template_paths(array(
array(
'name' => $template_lang . '_email', 'name' => $template_lang . '_email',
'ext_path' => 'language/' . $template_lang . '/email' 'ext_path' => 'language/' . $template_lang . '/email'
)
), $template_paths); ), $template_paths);
$this->template->set_filenames(array( $this->template->set_filenames(array(

10
phpBB/phpbb/template/twig/twig.php
View file

@ -236,12 +236,20 @@ class twig extends \phpbb\template\base
foreach ($names as $template_dir) foreach ($names as $template_dir)
{ {
if (is_array($template_dir) && isset($template_dir['ext_path'])) if (is_array($template_dir))
{
if (isset($template_dir['ext_path']))
{ {
$ext_style_template_path = $ext_path . $template_dir['ext_path']; $ext_style_template_path = $ext_path . $template_dir['ext_path'];
$ext_style_path = dirname($ext_style_template_path); $ext_style_path = dirname($ext_style_template_path);
} }
else else
{
$ext_style_path = $ext_path . 'styles/' . $template_dir['name'] . '/';
$ext_style_template_path = $ext_style_path . 'template/';
}
}
else
{ {
$ext_style_path = $ext_path . 'styles/' . $template_dir . '/'; $ext_style_path = $ext_path . 'styles/' . $template_dir . '/';
$ext_style_template_path = $ext_style_path . 'template/'; $ext_style_template_path = $ext_style_path . 'template/';