From a5584f19782143ed18479dd2b4414a22f0bf2fc4 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 3 Mar 2015 11:52:46 -0500
Subject: [PATCH] FIX: trying to deleting post with nil topic was failing
---
app/models/post_action.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 03f055a1e..6b9704d54 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -183,7 +183,7 @@ class PostAction < ActiveRecord::Base
end
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)
message_key = "flags_dispositions.#{disposition}"
message_key << "_and_deleted" if delete_post
@@ -422,7 +422,7 @@ class PostAction < ActiveRecord::Base
MAXIMUM_FLAGS_PER_POST = 3
def self.auto_close_if_threshold_reached(topic)
- return if topic.closed?
+ return if topic.nil? || topic.closed?
flags = PostAction.active
.flags