simplified code

fabpot · fabpot · commit c4b5d6d7fe43 · 2012-07-15T20:06:17.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
@@ -28,12 +28,10 @@ public function guessRoute(Request $request, $controller)
             $controller = $controller[0];
         }
 
-        if (!$controller instanceof RedirectController) {
-            return parent::guessRoute($request, $controller);
-        }
-
         if ($controller instanceof RedirectController) {
             return $request->attributes->get('_route');
         }
+
+        return parent::guessRoute($request, $controller);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,10 @@ public function guessRoute(Request $request, $controller)`
`28`	`28`	`$controller = $controller[0];`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (!$controller instanceof RedirectController) {`
`32`		`- return parent::guessRoute($request, $controller);`
`33`		`- }`
`34`		`-`
`35`	`31`	`if ($controller instanceof RedirectController) {`
`36`	`32`	`return $request->attributes->get('_route');`
`37`	`33`	`}`
	`34`	`+`
	`35`	`+ return parent::guessRoute($request, $controller);`
`38`	`36`	`}`
`39`	`37`	`}`