mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 15:37:51 +02:00
Code Issues Releases Wiki Activity

Determine default route after extensions

Browse Source 
Fixes #1819.
This commit is contained in:
Franz Liedke
2019-07-30 00:56:29 +02:00
parent b59aef7838
commit 1169e4aca6
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/core/src/Forum/ForumServiceProvider.php
View File

@@ -53,6 +53,10 @@ class ForumServiceProvider extends AbstractServiceProvider
return $routes; return $routes;
}); });
$this->app->afterResolving('flarum.forum.routes', function (RouteCollection $routes) {
$this->setDefaultRoute($routes);
});
$this->app->singleton('flarum.forum.middleware', function (Application $app) { $this->app->singleton('flarum.forum.middleware', function (Application $app) {
$pipe = new MiddlewarePipe; $pipe = new MiddlewarePipe;
@@ -181,7 +185,16 @@ class ForumServiceProvider extends AbstractServiceProvider
$this->app->make('events')->fire( $this->app->make('events')->fire(
new ConfigureForumRoutes($routes, $factory) 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'); $defaultRoute = $this->app->make('flarum.settings')->get('default_route');
if (isset($routes->getRouteData()[0]['GET'][$defaultRoute])) { if (isset($routes->getRouteData()[0]['GET'][$defaultRoute])) {