jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #2531: Topic merge should update updater_id

Browse Source
This commit is contained in:
r888888888
2015-10-26 12:55:42 -07:00
parent cae88fdac2
commit 34aa777aad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/forum_topic.rb
View File

@@ -149,8 +149,8 @@ class ForumTopic < ActiveRecord::Base
def merge(topic)
ForumPost.where(:id => self.posts.map(&:id)).update_all(:topic_id => topic.id)
topic.update_attribute(:response_count, topic.response_count + self.posts.length)
self.update_columns(:response_count => 0, :is_deleted => true)
topic.update_attributes(:response_count => topic.response_count + self.posts.length, :updater_id => CurrentUser.id)
self.update_columns(:response_count => 0, :is_deleted => true, :updater_id => CurrentUser.id)
end
def delete!