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

Refactor router to use routes.php as the default routes for all requests, even when using a routes directory.

This commit is contained in:
Taylor Otwell 2011-07-11 13:38:07 -07:00
parent 9224e62cbe
commit c95e7fdbbe
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
system/router.php
View File

@ -58,7 +58,9 @@ public static function route($method, $uri)
*/
public static function load($uri)
{
return (is_dir(APP_PATH.'routes')) ? static::load_from_directory($uri) : require APP_PATH.'routes'.EXT;
$base = require APP_PATH.'routes'.EXT;
return (is_dir(APP_PATH.'routes') and $uri !== '') ? array_merge(static::load_from_directory($uri), $base) : $base;
}
/**
@ -69,18 +71,9 @@ public static function load($uri)
*/
private static function load_from_directory($uri)
{
// If it exists, The "home" routes file is loaded for every request. This allows
// for "catch-all" routes such as http://example.com/username...
$home = (file_exists($path = APP_PATH.'routes/home'.EXT)) ? require $path : array();
if ($uri == '')
{
return $home;
}
$segments = explode('/', $uri);
return (file_exists($path = APP_PATH.'routes/'.$segments[0].EXT)) ? array_merge(require $path, $home) : $home;
return (file_exists($path = APP_PATH.'routes/'.$segments[0].EXT)) ? require $path : array();
}
/**