Skip to content

S
syncEnrollments
Commit 65d38526 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge branch 'develop'

parents baf46fa8 3dfc8d4a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
public/index.php
View file @ 65d38526
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
* @package Laravel * @package Laravel
* @version 1.2.1 * @version 1.2.1
* @author Taylor Otwell * @author Taylor Otwell1
* @license MIT License * @license MIT License
* @link http://laravel.com * @link http://laravel.com
*/ */
......
system/route/finder.php
View file @ 65d38526
...@@ -29,7 +29,12 @@ class Finder { ...@@ -29,7 +29,12 @@ class Finder {
// to all of the routes, not just the ones applicable to the request URI. // to all of the routes, not just the ones applicable to the request URI.
if (is_null(static::$routes)) 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)) if (array_key_exists($name, static::$names))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment