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

FIX: inline_uploads and subfolder (#8076) 

* FIX: inline_uploads and subfolder

* if subfolder, also look for images with a path containing
  cdn_url + relative_url_root

* FIX: migrate_to_s3 task and subfolder
This commit is contained in:
Michael Brown 2019-09-10 21:50:48 -04:00 committed by Sam
parent f0586ece32
commit 503a11cc88
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/inline_uploads.rb
View File

@ -282,7 +282,10 @@ class InlineUploads
/(#{base_url}\/uploads\/#{db}#{UPLOAD_REGEXP_PATTERN})/, /(#{base_url}\/uploads\/#{db}#{UPLOAD_REGEXP_PATTERN})/,
] ]
regexps << /(#{cdn_url}\/uploads\/#{db}#{UPLOAD_REGEXP_PATTERN})/ if cdn_url if cdn_url
regexps << /(#{cdn_url}\/uploads\/#{db}#{UPLOAD_REGEXP_PATTERN})/
regexps << /(#{cdn_url}#{GlobalSetting.relative_url_root}\/uploads\/#{db}#{UPLOAD_REGEXP_PATTERN})/ unless GlobalSetting.relative_url_root.nil?
end
if Discourse.store.external? if Discourse.store.external?
if Rails.configuration.multisite if Rails.configuration.multisite

2
lib/tasks/uploads.rake
View File

@ -306,7 +306,7 @@ def migrate_to_s3
puts "*" * 30 + " DRY RUN " + "*" * 30 if dry_run puts "*" * 30 + " DRY RUN " + "*" * 30 if dry_run
puts "Migrating uploads to S3 for '#{db}'..." puts "Migrating uploads to S3 for '#{db}'..."
if Upload.by_users.where("url NOT LIKE '//%' AND url NOT LIKE '/uploads/#{db}/original/_X/%'").exists? if Upload.by_users.where("url NOT LIKE '//%' AND url NOT LIKE '#{GlobalSetting.relative_url_root}/uploads/#{db}/original/_X/%'").exists?
puts <<~TEXT puts <<~TEXT
Some uploads were not migrated to the new scheme. Please run these commands in the rails console Some uploads were not migrated to the new scheme. Please run these commands in the rails console