mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

Browse Source 
Conflicts:
	phpBB/includes/functions.php
This commit is contained in:
Marc Alexander
2013-10-03 10:04:59 +02:00
parent 93531e7fb0 49ce2c13b2
commit 7006db7a2d
38 changed files with 388 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/index.php
View File

@@ -244,8 +244,8 @@ $config = new \phpbb\config\config(array(
'load_tplcompile' => '1'
));
$phpbb_filesystem = $phpbb_container->get('filesystem');
$template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new \phpbb\template\context());
$phpbb_path_helper = $phpbb_container->get('path_helper');
$template = new \phpbb\template\twig\twig($phpbb_path_helper, $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);