diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-06 20:35:18 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-06 20:35:54 -0400 |
| commit | 3a6b3d7c2b38b244d5c725ce1c7829328dae770f (patch) | |
| tree | a05c248c1f3e99ad2ebbfb16f12427f059cd6e9e /phpBB/common.php | |
| parent | d5808f13e5fa70ecc802c2a5a11c3143746c93f0 (diff) | |
| parent | 8d6b03c438392cebed941491684ff835bf7136a8 (diff) | |
| download | forums-3a6b3d7c2b38b244d5c725ce1c7829328dae770f.tar forums-3a6b3d7c2b38b244d5c725ce1c7829328dae770f.tar.gz forums-3a6b3d7c2b38b244d5c725ce1c7829328dae770f.tar.bz2 forums-3a6b3d7c2b38b244d5c725ce1c7829328dae770f.tar.xz forums-3a6b3d7c2b38b244d5c725ce1c7829328dae770f.zip | |
[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Conflicts:
phpBB/composer.json
phpBB/composer.lock
phpBB/develop/create_schema_files.php
phpBB/includes/ucp/ucp_register.php
PHPBB3-11673
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 962a1f951f..a7b7db28ac 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -109,6 +109,9 @@ $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_create_symfony_request($request); + // Grab global variables, re-cache if necessary $config = $phpbb_container->get('config'); set_config(null, null, null, $config); @@ -121,7 +124,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); |