diff options
author | ThibG <thib@sitedethib.com> | 2018-08-26 19:12:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-26 19:12:07 +0200 |
commit | af934b90710a2ce1099d3ceda5de7bcf0e94595c (patch) | |
tree | 71e25690e6300d0235d515ccd0241d082c8d1abe /app/workers/maintenance/destroy_media_worker.rb | |
parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
parent | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff) |
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/maintenance/destroy_media_worker.rb')
-rw-r--r-- | app/workers/maintenance/destroy_media_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/maintenance/destroy_media_worker.rb b/app/workers/maintenance/destroy_media_worker.rb index 5f052983b..cde33d6d7 100644 --- a/app/workers/maintenance/destroy_media_worker.rb +++ b/app/workers/maintenance/destroy_media_worker.rb @@ -6,7 +6,7 @@ class Maintenance::DestroyMediaWorker sidekiq_options queue: 'pull' def perform(media_attachment_id) - media = MediaAttachment.find(media_attachment_id) + media = media_attachment_id.is_a?(MediaAttachment) ? media_attachment_id : MediaAttachment.find(media_attachment_id) media.destroy rescue ActiveRecord::RecordNotFound true |