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

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
This commit is contained in:
Nathan Guse
2012-11-20 23:19:51 -06:00
parent 570c5ad3c0 b453f359ff
commit 61aa53f91a
64 changed files with 1654 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/common.php
View File

@@ -8,10 +8,6 @@
* Minimum Requirement: PHP 5.3.3
*/
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
/**
*/
if (!defined('IN_PHPBB'))
@@ -95,6 +91,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
),
array(
new phpbb_di_pass_collection_pass(),
new phpbb_di_pass_kernel_pass(),
),
$phpbb_root_path,
$phpEx