Skip to content

U
UserAdminV2
Commit 115bde0b by Taylor Otwell
Options

Refactor the route loader.

parent b25edfaf
Showing with 2 additions and 8 deletions
system/routing/loader.php
...@@ -86,10 +86,7 @@ class Loader { ...@@ -86,10 +86,7 @@ class Loader {
foreach ($paths as $path) foreach ($paths as $path)
{ {
if (file_exists($path.'routes'.EXT)) if (file_exists($path.'routes'.EXT)) $routes = array_merge($routes, require $path.'routes'.EXT);
{
$routes = array_merge($routes, require $path.'routes'.EXT);
}
if (is_dir($path.'routes')) if (is_dir($path.'routes'))
{ {
...@@ -101,10 +98,7 @@ class Loader { ...@@ -101,10 +98,7 @@ class Loader {
foreach ($recursiveIterator as $file) foreach ($recursiveIterator as $file)
{ {
if (filetype($file) === 'file' and strpos($file, EXT) !== false) if (filetype($file) === 'file' and strpos($file, EXT) !== false) $routes = array_merge($routes, require $file);
{
$routes = array_merge($routes, require $file);
}
} }
} }
} }
......
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