diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 12:24:35 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-24 12:24:35 -0500 |
| commit | 5d1afb453211d42a8deacb66684c136385918192 (patch) | |
| tree | dec14540ed07ca03bf223738aee405e4b604cd99 /phpBB/install | |
| parent | 44a82dd0837a4693b6a4a410c21c438f244094d3 (diff) | |
| download | forums-5d1afb453211d42a8deacb66684c136385918192.tar forums-5d1afb453211d42a8deacb66684c136385918192.tar.gz forums-5d1afb453211d42a8deacb66684c136385918192.tar.bz2 forums-5d1afb453211d42a8deacb66684c136385918192.tar.xz forums-5d1afb453211d42a8deacb66684c136385918192.zip | |
[ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 3 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 46660723ba..fd0d8a2d48 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -213,8 +213,7 @@ $config = new phpbb_config(array( )); $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); -$phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $template); -$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); +$template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); $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 df9b6c1c7e..51fbd1975c 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -71,7 +71,7 @@ class install_update extends module function main($mode, $sub) { - global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; + global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container; // Create a normal container now @@ -138,7 +138,7 @@ class install_update extends module } // Set custom template again. ;) - $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); + $template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), ''); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |