ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring the routing engine.

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-04 22:40:33 -05:00
parent 3e874867b8
commit d35e2abd77
8 changed files with 243 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/routing/router.php
View File

@@ -90,7 +90,7 @@ class Router {
// no need to spin through all of the routes.
if (isset($this->routes[$destination]))
{
return $this->request->route = new Route($destination, $this->routes[$destination], array(), $this->controller_path);
return $this->request->route = new Route($destination, $this->routes[$destination], array());
}
foreach ($this->routes as $keys => $callback)
@@ -105,7 +105,7 @@ class Router {
if (preg_match('#^'.$this->translate_wildcards($key).'$#', $destination))
{
return $this->request->route = new Route($keys, $callback, $this->parameters($destination, $key), $this->controller_path);
return $this->request->route = new Route($keys, $callback, $this->parameters($destination, $key));
}
}
}
@@ -147,7 +147,7 @@ class Router {
// were they to code the controller delegation manually.
$callback = function() use ($controller, $method) { return array($controller, $method); };
return new Route($controller, $callback, $segments, $this->controller_path);
return new Route($controller, $callback, $segments);
}
}