merged branch Tobion/patch-2 (PR #5843)

This PR was merged into the 2.1 branch. Commits ------- 7447ef7 slight refactoring in UrlMatcher Discussion ---------- slight refactoring in UrlMatcher bc break: no bug fix: no feature addition: no saving a variable
symfony · Oct 26, 2012 · 5155aec · 5155aec
2 parents 1277e67 + 7447ef7
commit 5155aec
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -174,13 +174,12 @@ protected function handleRouteRequirements($pathinfo, $name, Route $route)
      */
     protected function mergeDefaults($params, $defaults)
     {
-        $parameters = $defaults;
         foreach ($params as $key => $value) {
             if (!is_int($key)) {
-                $parameters[$key] = $value;
+                $defaults[$key] = $value;
             }
         }
 
-        return $parameters;
+        return $defaults;
     }
 }