diff options
| author | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
|---|---|---|
| committer | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
| commit | 2a42aee8acfcab79b0dd43572b9da2c4dd8a288a (patch) | |
| tree | 50400df541c6ac30ecf894830012b7a7c28b45fc /phpBB/install | |
| parent | 1d61bcedfd1882f84d102c523a354a8c4ae69336 (diff) | |
| parent | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (diff) | |
| download | forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.gz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.bz2 forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.xz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.zip | |
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
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 e683324bdf..43970029cb 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -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); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 1a90efc2b4..ab5fcc3f2b 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -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'], |