diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
| commit | 7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c (patch) | |
| tree | aceb567afda7467738ab6b693dc9595a40ac7f2f /phpBB/common.php | |
| parent | 93531e7fb0df7d9cd2de04ca06aa9eb6a847a1c4 (diff) | |
| parent | 49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (diff) | |
| download | forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.gz forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.bz2 forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.xz forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 80375f7a9c..6bb3509ea1 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -47,19 +47,7 @@ if (!defined('PHPBB_INSTALLED')) // Eliminate . and .. from the path require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx); - require($phpbb_root_path . 'phpbb/symfony_request.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/deactivated_super_global.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/type_cast_helper_interface.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/type_cast_helper.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/request_interface.' . $phpEx); - require($phpbb_root_path . 'phpbb/request/request.' . $phpEx); - $phpbb_filesystem = new phpbb\filesystem( - new phpbb\symfony_request( - new phpbb\request\request() - ), - $phpbb_root_path, - $phpEx - ); + $phpbb_filesystem = new phpbb\filesystem(); $script_path = $phpbb_filesystem->clean_path($script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; @@ -121,16 +109,13 @@ $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); set_config_count(null, null, null, $config); $phpbb_log = $phpbb_container->get('log'); +$phpbb_path_helper = $phpbb_container->get('path_helper'); // load extensions $phpbb_extension_manager = $phpbb_container->get('ext.manager'); |