mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/12509] Update calls to set_custom_style in forgotten places

Browse Source 
PHPBB3-12509
This commit is contained in:
Tristan Darricau
2014-05-14 02:16:32 +02:00
parent c8080d6464
commit 9d7c36041e
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_module.php
View File

@@ -581,7 +581,12 @@ class p_master
if (is_dir($module_style_dir)) if (is_dir($module_style_dir))
{ {
$template->set_custom_style('adm', array($module_style_dir, $phpbb_admin_path . 'style')); $template->set_custom_style(array(
array(
'name' => 'adm',
'ext_path' => 'adm/style/',
)
), array($module_style_dir, $phpbb_admin_path . 'style'));
} }
} }

7
phpBB/install/index.php
View File

@@ -250,7 +250,12 @@ $phpbb_path_helper = $phpbb_container->get('path_helper');
$template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new \phpbb\template\context()); $template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new \phpbb\template\context());
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir'); $paths = array_filter($paths, 'is_dir');
$template->set_custom_style('adm', $paths); $template->set_custom_style(array(
array(
'name' => 'adm',
'ext_path' => 'adm/style/',
)
), $paths);
$path = array_shift($paths); $path = array_shift($paths);

7
phpBB/install/install_update.php
View File

@@ -141,7 +141,12 @@ class install_update extends module
// Set custom template again. ;) // Set custom template again. ;)
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir'); $paths = array_filter($paths, 'is_dir');
$template->set_custom_style('adm', $paths); $template->set_custom_style(array(
array(
'name' => 'adm',
'ext_path' => 'adm/style/',
)
), $paths);
$template->assign_vars(array( $template->assign_vars(array(
'S_USER_LANG' => $user->lang['USER_LANG'], 'S_USER_LANG' => $user->lang['USER_LANG'],