From 2aa9288d52e19ea0b780144123142d650559cdf6 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Fri, 20 Jun 2014 17:36:11 -0700
Subject: [PATCH] fixes #1678

---
 app/logical/d_text.rb   | 2 +-
 test/unit/dtext_test.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 75569161f..eb560687b 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -103,7 +103,7 @@ class DText
   def self.parse_id_links(str)
     str = str.gsub(/\bpost #(\d+)/i, %{<a href="/posts/\\1">post #\\1</a>})
     str = str.gsub(/\bforum #(\d+)/i, %{<a href="/forum_posts/\\1">forum #\\1</a>})
-    str = str.gsub(/\btopic #(\d+)/i, %{<a href="/forum_topics/\\1">topic #\\1</a>})
+    str = str.gsub(/\btopic #(\d+)(?:\/p(\d+))?/i, %{<a href="/forum_topics/\\1?page=\\2">topic #\\1</a>})
     str = str.gsub(/\bcomment #(\d+)/i, %{<a href="/comments/\\1">comment #\\1</a>})
     str = str.gsub(/\bpool #(\d+)/i, %{<a href="/pools/\\1">pool #\\1</a>})
     str = str.gsub(/\buser #(\d+)/i, %{<a href="/users/\\1">user #\\1</a>})
diff --git a/test/unit/dtext_test.rb b/test/unit/dtext_test.rb
index 2cf4fa7c1..2126df7e5 100644
--- a/test/unit/dtext_test.rb
+++ b/test/unit/dtext_test.rb
@@ -168,4 +168,8 @@ class DTextTest < ActiveSupport::TestCase
   def test_table_with_newlines
     assert_equal("<table class=\"striped\"><thead>\n<tr>\n<th>header</th></tr></thead><tbody><tr><td><a href=\"/posts/100\">post #100</a></td></tr></tbody></table>", p("[table]\n[thead]\n[tr]\n[th]header[/th][/tr][/thead][tbody][tr][td]post #100[/td][/tr][/tbody][/table]"))
   end
+
+  def test_forum_links
+    assert_equal('<p><a href="/forum_topics/1234?page=4">topic #1234</a></p>', p("topic #1234/p4"))
+  end
 end