diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 13:25:20 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 13:25:20 -0500 |
| commit | 12c22585069066957cc3211136ebd480295d4758 (patch) | |
| tree | 6358ba04f28a8368ef5806aec70825466c30e778 /phpBB/install | |
| parent | 863592a8bedbacf3e7bf6bee458797e819020e6f (diff) | |
| download | forums-12c22585069066957cc3211136ebd480295d4758.tar forums-12c22585069066957cc3211136ebd480295d4758.tar.gz forums-12c22585069066957cc3211136ebd480295d4758.tar.bz2 forums-12c22585069066957cc3211136ebd480295d4758.tar.xz forums-12c22585069066957cc3211136ebd480295d4758.zip | |
[ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)
PHPBB3-11628
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 f80b975e2c..84d751e279 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -213,7 +213,7 @@ $config = new phpbb_config(array( )); $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); -$template->set_custom_style('admin', $phpbb_admin_path . 'style', ''); +$template->set_custom_style('admin', $phpbb_admin_path . 'style'); $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 63f10c96d7..a105944fb3 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -138,7 +138,7 @@ class install_update extends module } // Set custom template again. ;) - $template->set_custom_style('admin', $phpbb_admin_path . 'style', ''); + $template->set_custom_style('admin', $phpbb_admin_path . 'style'); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |