makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13388] Address comments

Browse source 
PHPBB3-13388
This commit is contained in:
Tristan Darricau 2015-05-29 16:37:58 +02:00
parent 66c0e0c6a8
commit 6656567424
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/phpbb/routing/router.php
View file

@ -195,13 +195,12 @@ class router implements RouterInterface
$route->setDefault($name, $this->resolve($value)); $route->setDefault($name, $this->resolve($value));
} }
$requirements = $route->getRequirements();
unset($requirements['_scheme']);
unset($requirements['_method']);
foreach ($route->getRequirements() as $name => $value) 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)); $route->setRequirement($name, $this->resolve($value));
} }