Skip to content

S
syncEnrollments
Commit 05e365d0 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Clean up route loader.

parent a6bb5f26
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
laravel/routing/loader.php
View file @ 05e365d0
......@@ -48,11 +48,9 @@ class Loader {
*/
public function load($uri)
{
$routes = (file_exists($path = $this->base.'routes'.EXT)) ? require $path : array();
$segments = Arr::without(explode('/', $uri), '');
return array_merge($this->nested($segments), $routes);
return array_merge($this->nested($segments), require $this->base.'routes'.EXT);
}
/**
......
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