From 8da446c8bc997a4b2a0040d3842a729d0be2978b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 11 Apr 2016 09:20:08 +0530 Subject: [PATCH] FIX: do not raise error if topic not found while logging --- app/services/staff_action_logger.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 4e8f8f8cea..c3e1412352 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -40,16 +40,17 @@ class StaffActionLogger def log_post_deletion(deleted_post, opts={}) raise Discourse::InvalidParameters.new(:deleted_post) unless deleted_post && deleted_post.is_a?(Post) - topic = deleted_post.topic || Topic.with_deleted.find(deleted_post.topic_id) + topic = deleted_post.topic || Topic.with_deleted.find_by(id: deleted_post.topic_id) username = deleted_post.user.try(:username) || "unknown" name = deleted_post.user.try(:name) || "unknown" + topic_title = topic.try(:title) || "not found" details = [ "id: #{deleted_post.id}", "created_at: #{deleted_post.created_at}", "user: #{username} (#{name})", - "topic: #{topic.title}", + "topic: #{topic_title}", "post_number: #{deleted_post.post_number}", "raw: #{deleted_post.raw}" ]