From 6656567424843d7118aba1eeb5fc0f4eb61a2e5a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Fri, 29 May 2015 16:37:58 +0200
Subject: [PATCH] [ticket/13388] Address comments

PHPBB3-13388
---
 phpBB/phpbb/routing/router.php | 9 ++++-----
 1 file 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));
 			}