diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 16:37:58 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 16:48:51 +0200 |
| commit | 6656567424843d7118aba1eeb5fc0f4eb61a2e5a (patch) | |
| tree | 8d9444eac52a5ab29556e1b71eadba11afd6c6af /phpBB/phpbb/routing | |
| parent | 66c0e0c6a83fbf091aa078ab06dd6467c8c6aa11 (diff) | |
| download | forums-6656567424843d7118aba1eeb5fc0f4eb61a2e5a.tar forums-6656567424843d7118aba1eeb5fc0f4eb61a2e5a.tar.gz forums-6656567424843d7118aba1eeb5fc0f4eb61a2e5a.tar.bz2 forums-6656567424843d7118aba1eeb5fc0f4eb61a2e5a.tar.xz forums-6656567424843d7118aba1eeb5fc0f4eb61a2e5a.zip | |
[ticket/13388] Address comments
PHPBB3-13388
Diffstat (limited to 'phpBB/phpbb/routing')
| -rw-r--r-- | phpBB/phpbb/routing/router.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index ca9799ba3e..270b54c4ba 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -195,13 +195,12 @@ class router implements RouterInterface $route->setDefault($name, $this->resolve($value)); } + $requirements = $route->getRequirements(); + unset($requirements['_scheme']); + unset($requirements['_method']); + foreach ($route->getRequirements() as $name => $value) { - if ($name === '_scheme' || $name === '_method') - { - continue; // ignore deprecated requirements to not trigger deprecation warnings - } - $route->setRequirement($name, $this->resolve($value)); } |