From ed4634dc341d76f2131b979dac0d97cc8090972e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 15 Jun 2016 14:41:08 +0200 Subject: [PATCH] FIX: don't error out when deleting a topic with no user --- app/services/staff_action_logger.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 4793424b7bf..fdfc7f200b3 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -65,10 +65,12 @@ class StaffActionLogger def log_topic_deletion(deleted_topic, opts={}) raise Discourse::InvalidParameters.new(:deleted_topic) unless deleted_topic && deleted_topic.is_a?(Topic) + user = delete_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)" + details = [ "id: #{deleted_topic.id}", "created_at: #{deleted_topic.created_at}", - "user: #{deleted_topic.user.username} (#{deleted_topic.user.name})", + "user: #{user}", "title: #{deleted_topic.title}" ]