Browse Source

bundle property wasn't being used, so I made use of it as well as adding the controllers name and action being called.

Daniel Petrie 12 years ago
parent
commit
b6cbac56c8
1 changed files with 18 additions and 0 deletions
  1. 18 0
      laravel/routing/controller.php

+ 18 - 0
laravel/routing/controller.php

@@ -25,6 +25,20 @@ abstract class Controller {
 	 * @var string
 	 * @var string
 	 */
 	 */
 	public $bundle;
 	public $bundle;
+	
+	/**
+	 * The controllers name
+	 *
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * The controllers action
+	 *
+	 * @var string
+	 */
+	public $action;
 
 
 	/**
 	/**
 	 * Indicates if the controller uses RESTful routing.
 	 * Indicates if the controller uses RESTful routing.
@@ -143,6 +157,10 @@ abstract class Controller {
 		list($controller, $method) = explode('@', $destination);
 		list($controller, $method) = explode('@', $destination);
 
 
 		$controller = static::resolve($bundle, $controller);
 		$controller = static::resolve($bundle, $controller);
+		
+		$controller->bundle = $bundle;
+		$controller->name   = $controller_name;
+		$controller->action = $method;
 
 
 		// If the controller could not be resolved, we're out of options and
 		// If the controller could not be resolved, we're out of options and
 		// will return the 404 error response. If we found the controller,
 		// will return the 404 error response. If we found the controller,