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

Refactoring Router.

Browse Source
This commit is contained in:
Taylor Otwell
2011-07-07 09:34:58 -07:00
parent 775f11e09b
commit f0b02caaec
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/router.php
View File

@@ -34,8 +34,8 @@ class Router {
foreach (static::$routes as $keys => $callback) foreach (static::$routes as $keys => $callback)
{ {
// Only check routes that have multiple URIs or wildcards. All other routes would have // Only check routes that have multiple URIs or wildcards. All other routes would
// been caught by a literal match. // have been caught by a literal match.
if (strpos($keys, '(') !== false or strpos($keys, ',') !== false ) if (strpos($keys, '(') !== false or strpos($keys, ',') !== false )
{ {
foreach (explode(', ', $keys) as $key) foreach (explode(', ', $keys) as $key)
@@ -44,6 +44,9 @@ class Router {
if (preg_match('#^'.$key.'$#', $method.' '.$uri)) if (preg_match('#^'.$key.'$#', $method.' '.$uri))
{ {
$uri = trim($uri, '/');
$key = trim(substr($key, strlen($method.' ')), '/');
return Request::$route = new Route($keys, $callback, static::parameters(explode('/', $uri), explode('/', $key))); return Request::$route = new Route($keys, $callback, static::parameters(explode('/', $uri), explode('/', $key)));
} }
} }