Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: trying to deleting post with nil topic was failing

This commit is contained in:
Neil Lalonde 2015-03-03 11:52:46 -05:00
parent 4714a562d9
commit a5584f1978
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/post_action.rb
View File

@ -183,7 +183,7 @@ class PostAction < ActiveRecord::Base
end end
def add_moderator_post_if_needed(moderator, disposition, delete_post=false) def add_moderator_post_if_needed(moderator, disposition, delete_post=false)
return if related_post.nil? return if related_post.nil? || related_post.topic.nil?
return if moderator_already_replied?(related_post.topic, moderator) return if moderator_already_replied?(related_post.topic, moderator)
message_key = "flags_dispositions.#{disposition}" message_key = "flags_dispositions.#{disposition}"
message_key << "_and_deleted" if delete_post message_key << "_and_deleted" if delete_post
@ -422,7 +422,7 @@ class PostAction < ActiveRecord::Base
MAXIMUM_FLAGS_PER_POST = 3 MAXIMUM_FLAGS_PER_POST = 3
def self.auto_close_if_threshold_reached(topic) def self.auto_close_if_threshold_reached(topic)
return if topic.closed? return if topic.nil? || topic.closed?
flags = PostAction.active flags = PostAction.active
.flags .flags