Fix bug with Route::controller and group namespaces.

taylorotwell · taylorotwell · commit 16723708d15e · 2013-12-29T19:24:54.000-06:00
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -249,15 +249,17 @@ public function controllers(array $controllers)
 	 */
 	public function controller($uri, $controller, $names = array())
 	{
+		$prepended = $controller;
+
 		// First, we will check to see if a controller prefix has been registered in
 		// the route group. If it has, we will need to prefix it before trying to
 		// reflect into the class instance and pull out the method for routing.
 		if (count($this->groupStack) > 0)
 		{
-			$controller = $this->prependGroupUses($controller);
+			$prepended = $this->prependGroupUses($controller);
 		}
 
-		$routable = $this->getInspector()->getRoutable($controller, $uri);
+		$routable = $this->getInspector()->getRoutable($prepended, $uri);
 
 		// When a controller is routed using this method, we use Reflection to parse
 		// out all of the routable methods for the controller, then register each

Original file line number	Diff line number	Diff line change
`@@ -249,15 +249,17 @@ public function controllers(array $controllers)`
`249`	`249`	`*/`
`250`	`250`	`public function controller($uri, $controller, $names = array())`
`251`	`251`	`{`
	`252`	`+ $prepended = $controller;`
	`253`	`+`
`252`	`254`	`// First, we will check to see if a controller prefix has been registered in`
`253`	`255`	`// the route group. If it has, we will need to prefix it before trying to`
`254`	`256`	`// reflect into the class instance and pull out the method for routing.`
`255`	`257`	`if (count($this->groupStack) > 0)`
`256`	`258`	`{`
`257`		`- $controller = $this->prependGroupUses($controller);`
	`259`	`+ $prepended = $this->prependGroupUses($controller);`
`258`	`260`	`}`
`259`	`261`
`260`		`- $routable = $this->getInspector()->getRoutable($controller, $uri);`
	`262`	`+ $routable = $this->getInspector()->getRoutable($prepended, $uri);`
`261`	`263`
`262`	`264`	`// When a controller is routed using this method, we use Reflection to parse`
`263`	`265`	`// out all of the routable methods for the controller, then register each`