FIX: Do not enqueue update_post_uploads_secure_status unnecessarily (#20366)

We call `post.update_uploads_secure_status` in both
`PostCreator` and `PostRevisor`. Only the former was checking
if `SiteSetting.secure_uploads?` was enabled, but the latter
was not. There is no need to enqueue the job
`UpdatePostUploadsSecureStatus` if secure_uploads is not
enabled for the site.
This commit is contained in:
Martin Brennan 2023-02-20 11:21:54 +10:00 committed by GitHub
parent cd247d5322
commit 7ad92b7ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions

View File

@ -1035,7 +1035,7 @@ class Post < ActiveRecord::Base
end
def update_uploads_secure_status(source:)
if Discourse.store.external?
if Discourse.store.external? && SiteSetting.secure_uploads?
Jobs.enqueue(:update_post_uploads_secure_status, post_id: self.id, source: source)
end
end

View File

@ -190,7 +190,7 @@ class PostCreator
update_user_counts
create_embedded_topic
@post.link_post_uploads
update_uploads_secure_status
@post.update_uploads_secure_status(source: "post creator")
delete_owned_bookmarks
ensure_in_allowed_users if guardian.is_staff?
unarchive_message if !@opts[:import_mode]
@ -402,10 +402,6 @@ class PostCreator
rollback_from_errors!(embed) unless embed.save
end
def update_uploads_secure_status
@post.update_uploads_secure_status(source: "post creator") if SiteSetting.secure_uploads?
end
def delete_owned_bookmarks
return if !@post.topic_id
BookmarkManager.new(@user).destroy_for_topic(