Merge pull request #3069 from techAPJ/patch-3

FIX: deleted topics were failing user posts archive download
2014-12-29 15:14:50 -05:00 · 2014-12-29 15:14:50 -05:00 · 1b7450b5ae
parent b1fae2ee33 e7bfbe8552
commit 1b7450b5ae
1 changed files with 4 additions and 0 deletions
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@ -132,6 +132,10 @@ module Jobs
        user_archive_array = []
        topic_data = user_archive.topic
        user_archive = user_archive.as_json
+        if topic_data.nil?
+          # deleted topic
+          topic_data = Topic.with_deleted.find_by(id: user_archive['topic_id'])
+        end
        category = topic_data.category
        sub_category = "-"
        if category