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

Merge pull request #3486 from techAPJ/patch-2 

FIX: handle user export failure when post is not linked to a topic
This commit is contained in:
Régis Hanol 2015-05-18 09:21:58 +02:00
parent 269074f43e b3314ea801
commit b2f50c154a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/jobs/regular/export_csv_file.rb
View File

@ -130,11 +130,9 @@ module Jobs
user_archive_array = [] user_archive_array = []
topic_data = user_archive.topic topic_data = user_archive.topic
user_archive = user_archive.as_json user_archive = user_archive.as_json
if topic_data.nil? topic_data = Topic.with_deleted.find_by(id: user_archive['topic_id']) if topic_data.nil?
# deleted topic return user_archive_array if topic_data.nil?
topic_data = Topic.with_deleted.find_by(id: user_archive['topic_id']) category = topic_data.category
end
category = topic_data.category if topic_data
sub_category = "-" sub_category = "-"
if category if category
category_name = category.name category_name = category.name