Fix topic merge

It was merging in the wrong direction, and didn't update response count.
2014-11-12 01:20:27 -05:00
parent 30700df635
commit 2ee548dc85
2 changed files with 4 additions and 3 deletions
--- a/app/controllers/forum_topics_controller.rb
+++ b/app/controllers/forum_topics_controller.rb
@@ -78,7 +78,7 @@ class ForumTopicsController < ApplicationController
    @forum_topic = ForumTopic.find(params[:id])
    @merged_topic = ForumTopic.find(params[:merged_id])
    @forum_topic.merge(@merged_topic)
-    redirect_to forum_topic_path(@forum_topic)
+    redirect_to forum_topic_path(@merged_topic)
  end

 private