diff options
author | Igor Wiedler <igor@wiedler.ch> | 2012-11-19 22:28:12 +0100 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-19 22:28:12 +0100 |
commit | b453f359ff6dab58b0eaf94548c4e58110fb02ec (patch) | |
tree | 9202c97ffd6ba11920d848c4ee8cb74f860b826a /phpBB/common.php | |
parent | f4fedfe95bdebe276563e9718cf3f3480dc2b8b9 (diff) | |
parent | 305f41cf1a540984fd7a71b61a601b1794e3bd04 (diff) | |
download | forums-b453f359ff6dab58b0eaf94548c4e58110fb02ec.tar forums-b453f359ff6dab58b0eaf94548c4e58110fb02ec.tar.gz forums-b453f359ff6dab58b0eaf94548c4e58110fb02ec.tar.bz2 forums-b453f359ff6dab58b0eaf94548c4e58110fb02ec.tar.xz forums-b453f359ff6dab58b0eaf94548c4e58110fb02ec.zip |
Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
[feature/controller] Fix misnamed route for functional test
[feature/controller] Fix comments, check against more general HttpException
[feature/controller] Check for proper status codes from controllers
[feature/controller] Correctly create Symfony object from globals
[feature/controller] Add documentation about input being HTML-escaped
[feature/controller] Create Symfony Request in new function
[feature/controller] Remove unused language strings
[feature/controller] Don't use $user->lang() before container compilation
[feature/controller] Update routing documentation for using query string
[feature/controller] Remove now-unused code
[feature/controller] Remove url rewriting until we use pathinfo in controllers
[feature/controller] Fix functional tests to use query string for controllers
[feature/controller] Allow injecting Symfony Request into controllers
[feature/controller] Use query string, not path info, for controller access
[feature/controller] Fix line endings and permissions, and check responses
[feature/controller] Remove URL rewriting by default
[feature/controller] Add controller functional test with template
[feature/controller] Use warning instead of echo for copy() and unlink()
[feature/controller] Flip method parameters, require $message
[feature/controller] Rename $root_path class property to $phpbb_root_path
...
Diffstat (limited to 'phpBB/common.php')
-rw-r--r-- | phpBB/common.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index c4237dfcf5..e99b9edee5 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -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 |