diff options
| author | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
| commit | afc12906b92c2cf126fa2ff9006583d0c4ef01ec (patch) | |
| tree | 0140929b3ddc902fb7f072af2425040d7a43d814 /phpBB/install | |
| parent | dcf82d9a5ae26de462687325b4d8553e4aaca7d4 (diff) | |
| parent | aae7677d71112e468b56be7e10d16f3b381fcad7 (diff) | |
| download | forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.gz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.bz2 forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.xz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11628' into develop
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 7 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index bd39e231f4..530728bdba 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -244,15 +244,10 @@ $config = new phpbb_config(array( 'load_tplcompile' => '1' )); -$phpbb_style_resource_locator = new phpbb_style_resource_locator(); -$phpbb_style_path_provider = new phpbb_style_path_provider(); $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, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); -$phpbb_style->set_ext_dir_prefix('adm/'); - $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array_filter($paths, 'is_dir'); -$phpbb_style->set_custom_style('admin', $paths, array(), ''); +$template->set_custom_style('admin', $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 4ae39f202f..a569e0ad9a 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -70,7 +70,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; // We must enable super globals, otherwise creating a new instance of the request class, @@ -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'); - $phpbb_style->set_custom_style('admin', $paths, array(), ''); + $template->set_custom_style('admin', $paths); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |