StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	app/Http/Controllers/Base/LanguageController.php
#	app/Http/Kernel.php
#	app/Http/Middleware/TrimStrings.php
#	app/Providers/RouteServiceProvider.php
This commit is contained in:
Dane Everitt 2017-04-01 21:03:10 -04:00
commit 5927e0e12a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 641 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/Providers/RouteServiceProvider.php
View file

@ -33,21 +33,6 @@ class RouteServiceProvider extends ServiceProvider
*/
public function map()
{
$this->mapper();
Route::group(['namespace' => $this->namespace], function ($router) {
foreach (glob(app_path('Http//Routes') . '/*.php') as $file) {
$this->app->make('Pterodactyl\\Http\\Routes\\' . basename($file, '.php'))->map($router);
}
});
}
/**
* Configure all routes used by the application.
*
* @return void
*/
protected function mapper() {
Route::middleware(['web', 'auth', 'csrf'])
->namespace($this->namespace . '\Base')
->group(base_path('routes/base.php'));