mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-21 16:51:34 +02:00
Code Issues Releases Wiki Activity

Supporting routing of URL with nothing after the discussion ID

Browse Source 
closes flarum/core#181
This commit is contained in:
Toby Zerner
2015-07-28 13:46:43 +09:30
parent e70f129330
commit 66cbbbc2c5
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/core/js/forum/src/initializers/routes.js
View File

@@ -14,6 +14,7 @@ export default function(app) {
'index': { path: '/', component: IndexPage.component() }, 'index': { path: '/', component: IndexPage.component() },
'index.filter': { path: '/:filter', component: IndexPage.component() }, 'index.filter': { path: '/:filter', component: IndexPage.component() },
'discussion.id': { path: '/d/:id', component: DiscussionPage.component() },
'discussion': { path: '/d/:id/:slug', component: DiscussionPage.component() }, 'discussion': { path: '/d/:id/:slug', component: DiscussionPage.component() },
'discussion.near': { path: '/d/:id/:slug/:near', component: DiscussionPage.component() }, 'discussion.near': { path: '/d/:id/:slug/:near', component: DiscussionPage.component() },

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

@@ -59,7 +59,7 @@ class ForumServiceProvider extends ServiceProvider
); );
$routes->get( $routes->get(
'/d/{id:\d+}/{slug}[/{near}]', '/d/{id:\d+}[/{slug}[/{near}]]',
'flarum.forum.discussion', 'flarum.forum.discussion',
$this->action('Flarum\Forum\Actions\DiscussionAction') $this->action('Flarum\Forum\Actions\DiscussionAction')
); );

1
framework/core/src/Support/ClientAction.php
View File

@@ -71,6 +71,7 @@ abstract class ClientAction extends HtmlAction
/** /**
* @param Client $apiClient * @param Client $apiClient
* @param LocaleManager $locales * @param LocaleManager $locales
* @param SettingsRepository $settings
*/ */
public function __construct(Client $apiClient, LocaleManager $locales, SettingsRepository $settings) public function __construct(Client $apiClient, LocaleManager $locales, SettingsRepository $settings)
{ {