From f606dc7020ebedf0c5025346f9610b218751ae50 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 31 Aug 2015 14:43:42 +0930
Subject: [PATCH] Permit trailing slashes in discussion/user URLs

closes #334
---
 framework/core/src/Forum/ForumServiceProvider.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
index 02def21e3..af6d98acf 100644
--- a/framework/core/src/Forum/ForumServiceProvider.php
+++ b/framework/core/src/Forum/ForumServiceProvider.php
@@ -67,13 +67,13 @@ class ForumServiceProvider extends ServiceProvider
         );
 
         $routes->get(
-            '/d/{id:\d+(?:-[^/]*)?}[/{near}]',
+            '/d/{id:\d+(?:-[^/]*)?}[/{near:[^/]*}]',
             'flarum.forum.discussion',
             $this->action('Flarum\Forum\Actions\DiscussionAction')
         );
 
         $routes->get(
-            '/u/{username}[/{filter}]',
+            '/u/{username}[/{filter:[^/]*}]',
             'flarum.forum.user',
             $this->action('Flarum\Forum\Actions\ClientAction')
         );