mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-07 08:56:38 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:flarum/core

Browse Source
This commit is contained in:
Daniël Klabbers
2019-07-31 17:10:47 +02:00
parent 894db01ad8 bd04023359
commit f0dff95d62
8 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Forum/ForumServiceProvider.php
View File

@@ -53,6 +53,10 @@ class ForumServiceProvider extends AbstractServiceProvider
return $routes;
});
$this->app->afterResolving('flarum.forum.routes', function (RouteCollection $routes) {
$this->setDefaultRoute($routes);
});
$this->app->singleton('flarum.forum.middleware', function (Application $app) {
$pipe = new MiddlewarePipe;
@@ -181,7 +185,16 @@ class ForumServiceProvider extends AbstractServiceProvider
$this->app->make('events')->fire(
new ConfigureForumRoutes($routes, $factory)
);
}
/**
* Determine the default route.
*
* @param RouteCollection $routes
*/
protected function setDefaultRoute(RouteCollection $routes)
{
$factory = $this->app->make(RouteHandlerFactory::class);
$defaultRoute = $this->app->make('flarum.settings')->get('default_route');
if (isset($routes->getRouteData()[0]['GET'][$defaultRoute])) {