github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 18:01:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't treat 'upload_patterns' as constant to make the rake task compatible with multisite

Browse Source
This commit is contained in:
Vinoth Kannan
2019-04-25 02:06:03 +05:30
parent b0bb1d95a5
commit aed683390c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -570,4 +570,4 @@ DEPENDENCIES
webpush webpush
BUNDLED WITH BUNDLED WITH
1.17.3 2.0.1

14
lib/tasks/posts.rake
View File

@ -390,12 +390,6 @@ task 'posts:reorder_posts', [:topic_id] => [:environment] do |_, args|
puts "", "Done.", "" puts "", "Done.", ""
end end
UPLOAD_PATTERNS ||= [
/\/uploads\/#{RailsMultisite::ConnectionManagement.current_db}\//,
/\/original\//,
/\/optimized\//
].freeze
def get_missing_uploads def get_missing_uploads
PostCustomField.where(name: Post::MISSING_UPLOADS) PostCustomField.where(name: Post::MISSING_UPLOADS)
end end
@ -403,6 +397,12 @@ end
desc 'Finds missing post upload records from cooked HTML content' desc 'Finds missing post upload records from cooked HTML content'
task 'posts:missing_uploads' => :environment do task 'posts:missing_uploads' => :environment do
get_missing_uploads.delete_all get_missing_uploads.delete_all
upload_patterns = [
/\/uploads\/#{RailsMultisite::ConnectionManagement.current_db}\//,
/\/original\//,
/\/optimized\//
]
missing_uploads = [] missing_uploads = []
old_scheme_upload_count = 0 old_scheme_upload_count = 0
count = 0 count = 0
@ -416,7 +416,7 @@ task 'posts:missing_uploads' => :environment do
Nokogiri::HTML::fragment(post.cooked).css("a/@href", "img/@src").each do |media| Nokogiri::HTML::fragment(post.cooked).css("a/@href", "img/@src").each do |media|
src = media.value src = media.value
next if src.blank? || UPLOAD_PATTERNS.none? { |pattern| src =~ pattern } next if src.blank? || upload_patterns.none? { |pattern| src =~ pattern }
src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//") src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
next unless Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i next unless Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i