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

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

Browse Source
This commit is contained in:
Yuriy Rusko
2014-05-28 01:02:39 +02:00
parent 1d61bcedfd 08c01b7cee
commit 2a42aee8ac
10 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/install/index.php
View File

@@ -254,7 +254,12 @@ $phpbb_path_helper = $phpbb_container->get('path_helper');
$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_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);

7
phpBB/install/install_update.php
View File

@@ -145,7 +145,12 @@ class install_update extends module
// Set custom template again. ;)
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$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(
'S_USER_LANG' => $user->lang['USER_LANG'],