Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a few controller delegation issues.

This commit is contained in:
Taylor Otwell 2011-08-25 23:34:33 -05:00
parent a045496684
commit 195f7862cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/controller.php
View File

@ -11,7 +11,7 @@ abstract class Controller {
* @param Request $request * @param Request $request
* @return mixed * @return mixed
*/ */
public function before(Request $request) {} public function before($request) {}
/** /**
* Magic Method to handle calls to undefined functions on the controller. * Magic Method to handle calls to undefined functions on the controller.

2
laravel/routing/handler.php
View File

@ -126,7 +126,7 @@ protected function delegate($controller, $method, $parameters)
$controller = $this->resolve($controller); $controller = $this->resolve($controller);
$response = $controller->before($this->request); $response = ($method == 'before' or strncmp($method, '_', 1) === 0) ? new Error('404') : $controller->before($this->request);
return (is_null($response)) ? call_user_func_array(array($controller, $method), $parameters) : $response; return (is_null($response)) ? call_user_func_array(array($controller, $method), $parameters) : $response;
} }