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

Merge branch 'develop'

This commit is contained in:
Taylor Otwell 2011-07-16 13:49:46 -05:00
parent baf46fa8bb 3dfc8d4aaa
commit 65d38526ed
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.php
View File

@ -4,7 +4,7 @@
*
* @package Laravel
* @version 1.2.1
* @author Taylor Otwell
* @author Taylor Otwell1
* @license MIT License
* @link http://laravel.com
*/

7
system/route/finder.php
View File

@ -29,7 +29,12 @@ public static function find($name)
// to all of the routes, not just the ones applicable to the request URI.
if (is_null(static::$routes))
{
static::$routes = (is_dir(APP_PATH.'routes')) ? static::load() : require APP_PATH.'routes'.EXT;
static::$routes = require APP_PATH.'routes'.EXT;
if (is_dir(APP_PATH.'routes'))
{
static::$routes = array_merge(static::load(), static::$routes);
}
}
if (array_key_exists($name, static::$names))