diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-14 02:16:32 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-14 02:16:32 +0200 |
| commit | 9d7c36041e0dac509476069ee5bbce92e841f33e (patch) | |
| tree | b314659b96340c4c680c198308766a06ee7b77bf /phpBB/install | |
| parent | c8080d6464a406deaa4b5b2d375eea119f049dff (diff) | |
| download | forums-9d7c36041e0dac509476069ee5bbce92e841f33e.tar forums-9d7c36041e0dac509476069ee5bbce92e841f33e.tar.gz forums-9d7c36041e0dac509476069ee5bbce92e841f33e.tar.bz2 forums-9d7c36041e0dac509476069ee5bbce92e841f33e.tar.xz forums-9d7c36041e0dac509476069ee5bbce92e841f33e.zip | |
[ticket/12509] Update calls to set_custom_style in forgotten places
PHPBB3-12509
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 7 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 66c8559e98..8d13c182d8 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -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()); $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); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 87b7d8d703..ab276624ee 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -141,7 +141,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'], |