diff options
| author | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
|---|---|---|
| committer | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
| commit | e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806 (patch) | |
| tree | 0c7421d14d3f803358740a2febb84bc06acd4dac /phpBB/common.php | |
| parent | 564a7cc89dcd2464024b78fe2e70adef771368f2 (diff) | |
| parent | 717e2337b9276d9f9680110dff552ea536d0723c (diff) | |
| download | forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.gz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.bz2 forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.xz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 962a1f951f..b9ba37935d 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -47,7 +47,13 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); - $phpbb_filesystem = new phpbb_filesystem(); + $phpbb_filesystem = new phpbb_filesystem( + new phpbb_symfony_request( + new phpbb_request() + ), + $phpbb_root_path, + $phpEx + ); $script_path = $phpbb_filesystem->clean_path($script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; @@ -109,6 +115,10 @@ $db = $phpbb_container->get('dbal.conn'); // make sure request_var uses this request instance request_var('', 0, false, false, $request); // "dependency injection" for a function +// Create a Symfony Request object from our phpbb_request object +$symfony_request = $phpbb_container->get('symfony_request'); +$phpbb_filesystem = $phpbb_container->get('filesystem'); + // Grab global variables, re-cache if necessary $config = $phpbb_container->get('config'); set_config(null, null, null, $config); @@ -121,7 +131,6 @@ $phpbb_extension_manager = $phpbb_container->get('ext.manager'); $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader'); $template = $phpbb_container->get('template'); -$phpbb_style = $phpbb_container->get('style'); // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); |