diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 21:11:34 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 21:11:34 +0200 |
| commit | fd96f97dc3c659e1d2e9b58420d652ad79387fbf (patch) | |
| tree | 96bc528157271485983689b59967c5692f2fc21d /phpBB/install | |
| parent | 1ce4d4c4fc482f33fd061c4f718b4f8c3656dbdb (diff) | |
| download | forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.gz forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.bz2 forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.tar.xz forums-fd96f97dc3c659e1d2e9b58420d652ad79387fbf.zip | |
[feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization.
PHPBB3-10632
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 7c6dd10d03..1f013df72b 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -202,9 +202,9 @@ $config = new phpbb_config(array( )); $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false); +$style->set_ext_dir_prefix('adm/'); +$style->set_custom_style('admin', '../adm/style', ''); $template = $style->template; -$template->set_ext_dir_prefix('adm/'); -$template->set_custom_template('../adm/style', 'admin'); $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', '../adm/style'); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index aba692aa62..dcf01e5cc8 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 $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; + global $style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; global $request; $this->tpl_name = 'install_update'; @@ -131,7 +131,7 @@ class install_update extends module } // Set custom template again. ;) - $template->set_custom_template('../adm/style', 'admin'); + $style->set_custom_style('admin', '../adm/style', ''); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |