github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 01:24:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the build.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-07-10 09:48:57 +08:00
parent 10bc69a62f
commit 5374a0e720
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/topic.rb
View File

@ -912,8 +912,14 @@ class Topic < ActiveRecord::Base
post_mover = PostMover.new(self, moved_by, post_ids)
if opts[:destination_topic_id]
post_mover.to_topic opts[:destination_topic_id]
DiscourseEvent.trigger(:topic_merged, post_mover.original_topic, post_mover.destination_topic)
topic = post_mover.to_topic(opts[:destination_topic_id])
DiscourseEvent.trigger(:topic_merged,
post_mover.original_topic,
post_mover.destination_topic
)
topic
elsif opts[:title]
post_mover.to_new_topic(opts[:title], opts[:category_id], opts[:tags])
end