FIX: Do not try to recover invalid Upload#short_url in UploadRecovery.

This commit is contained in:
Guo Xiang Tan
2018-09-13 13:59:17 +08:00
parent 1afe7162e1
commit 5eb65ad612
2 changed files with 34 additions and 19 deletions

View File

@@ -34,9 +34,12 @@ class UploadRecovery
private
def recover_post_upload(post, short_url)
sha1 = Upload.sha1_from_short_url(short_url)
return unless sha1.present?
attributes = {
post: post,
sha1: Upload.sha1_from_short_url(short_url)
sha1: sha1
}
if Discourse.store.external?
@@ -47,8 +50,6 @@ class UploadRecovery
end
def recover_from_local(post:, sha1:)
return unless sha1.present?
public_path = Rails.root.join("public")
@paths ||= begin