diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-02 16:45:12 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-02 16:45:12 -0700 |
| commit | 8d6b03c438392cebed941491684ff835bf7136a8 (patch) | |
| tree | d2222c258607adcfd188161456de956cf488404f /phpBB/install | |
| parent | cc2302b537dd3879214975579a54e06e02becc56 (diff) | |
| parent | 8ee86b75908141c28aa4d92ba93921337cde30c3 (diff) | |
| download | forums-8d6b03c438392cebed941491684ff835bf7136a8.tar forums-8d6b03c438392cebed941491684ff835bf7136a8.tar.gz forums-8d6b03c438392cebed941491684ff835bf7136a8.tar.bz2 forums-8d6b03c438392cebed941491684ff835bf7136a8.tar.xz forums-8d6b03c438392cebed941491684ff835bf7136a8.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11791' into develop
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 530728bdba..ec9aa5f32a 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -247,7 +247,7 @@ $config = new phpbb_config(array( $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $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('admin', $paths); +$template->set_custom_style('adm', $paths); $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index a569e0ad9a..8ab0ad49d3 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -143,7 +143,7 @@ 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('admin', $paths); + $template->set_custom_style('adm', $paths); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |