diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-15 22:42:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-15 22:42:38 +0200 |
| commit | 76aa7372651de8162c3e2ea7aca31de00f2631ba (patch) | |
| tree | 710b9962b5a469712ae0ef5baae17b02a777c8f6 /phpBB/config | |
| parent | 674ea44bc655010aa91ff09f21162b5e9f880a1b (diff) | |
| parent | 720561de6e6284455342ae7d04c8a656f9f455f9 (diff) | |
| download | forums-76aa7372651de8162c3e2ea7aca31de00f2631ba.tar forums-76aa7372651de8162c3e2ea7aca31de00f2631ba.tar.gz forums-76aa7372651de8162c3e2ea7aca31de00f2631ba.tar.bz2 forums-76aa7372651de8162c3e2ea7aca31de00f2631ba.tar.xz forums-76aa7372651de8162c3e2ea7aca31de00f2631ba.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13056] Move the arguments of the request class to the DI
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/parameters.yml | 1 | ||||
| -rw-r--r-- | phpBB/config/services.yml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/config/parameters.yml b/phpBB/config/parameters.yml index 5bf2c678ee..b076ea3ecb 100644 --- a/phpBB/config/parameters.yml +++ b/phpBB/config/parameters.yml @@ -1,2 +1,3 @@ parameters: + core.disable_super_globals: true datetime.class: \phpbb\datetime diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 751aea03ae..cc082a4cec 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -329,6 +329,9 @@ services: request: class: phpbb\request\request + arguments: + - null + - %core.disable_super_globals% symfony_request: class: phpbb\symfony_request |