From 183badef8665aa1bc54a01da41361f6392ce1a87 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 25 Aug 2015 19:52:56 +0930
Subject: [PATCH] Use new discussion URL format

---
 extensions/mentions/src/Listeners/AddPostMentionsFormatter.php | 2 +-
 extensions/mentions/views/emails/postMentioned.blade.php       | 2 +-
 extensions/mentions/views/emails/userMentioned.blade.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php b/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
index e4ac9d8bc..b1355a2ab 100755
--- a/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
+++ b/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
@@ -25,7 +25,7 @@ class AddPostMentionsFormatter
         $tag->attributes['number']->required = false;
         $tag->attributes['discussionid']->required = false;
 
-        $tag->template = '<a href="/d/{@discussionid}/-/{@number}" class="PostMention" data-id="{@id}"><xsl:value-of select="@username"/></a>';
+        $tag->template = '<a href="/d/{@discussionid}/{@number}" class="PostMention" data-id="{@id}"><xsl:value-of select="@username"/></a>';
 
         $tag->filterChain
             ->prepend([static::class, 'addId'])
diff --git a/extensions/mentions/views/emails/postMentioned.blade.php b/extensions/mentions/views/emails/postMentioned.blade.php
index 249b3ad0e..0b9b0bb3d 100644
--- a/extensions/mentions/views/emails/postMentioned.blade.php
+++ b/extensions/mentions/views/emails/postMentioned.blade.php
@@ -2,7 +2,7 @@ Hey {{ $user->username }}!
 
 {{ $blueprint->reply->user->username }} replied to your post (#{{ $blueprint->post->number }}) in {{ $blueprint->post->discussion->title }}.
 
-{{ \Flarum\Core::config('base_url') }}/d/{{ $blueprint->reply->discussion_id }}/-/{{ $blueprint->reply->number }}
+{{ \Flarum\Core::config('base_url') }}/d/{{ $blueprint->reply->discussion_id }}/{{ $blueprint->reply->number }}
 
 ---
 
diff --git a/extensions/mentions/views/emails/userMentioned.blade.php b/extensions/mentions/views/emails/userMentioned.blade.php
index e131a4c85..a8831e6c6 100644
--- a/extensions/mentions/views/emails/userMentioned.blade.php
+++ b/extensions/mentions/views/emails/userMentioned.blade.php
@@ -2,7 +2,7 @@ Hey {{ $user->username }}!
 
 {{ $blueprint->post->user->username }} mentioned you in a post in {{ $blueprint->post->discussion->title }}.
 
-{{ \Flarum\Core::config('base_url') }}/d/{{ $blueprint->post->discussion_id }}/-/{{ $blueprint->post->number }}
+{{ \Flarum\Core::config('base_url') }}/d/{{ $blueprint->post->discussion_id }}/{{ $blueprint->post->number }}
 
 ---