diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
| commit | 2472271bc0cd7c15c77783c86ccaac643ab1756a (patch) | |
| tree | 0877d20f422411ed20b398c616b26b69ff30fdcd /phpBB/install | |
| parent | 21bbb5850349326464204bdb1bea7ecf5a88c10a (diff) | |
| download | forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.gz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.bz2 forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.xz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.zip | |
[ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 90d840aa31..e94c393922 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -244,20 +244,11 @@ $config = new \phpbb\config\config(array( 'load_tplcompile' => '1' )); -<<<<<<< HEAD -$phpbb_style_resource_locator = new \phpbb\style\resource_locator(); -$phpbb_style_path_provider = new \phpbb\style\path_provider(); $template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $user, new \phpbb\template\context()); -$phpbb_style = new \phpbb\style\style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); -$phpbb_style->set_ext_dir_prefix('adm/'); -$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', 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('adm', $paths); ->>>>>>> github-phpbb/develop $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); |