Skip to content

S
syncEnrollments
Commit 55a201ac authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fixed bug in route finder when looking for routes in route directory.

parent 7d50f5f9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
system/route/finder.php
View file @ 55a201ac
...@@ -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