Skip to content
Permalink
Browse files

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
  • Loading branch information...
Supermathie authored and SamSaffron committed Sep 11, 2019
1 parent f0586ec commit 503a11cc88f63a555a1afd9e2cc5f02708467c4f
Showing with 5 additions and 2 deletions.
  1. +4 −1 app/services/inline_uploads.rb
  2. +1 −1 lib/tasks/uploads.rake
@@ -282,7 +282,10 @@ def self.matched_uploads(node)
/(#{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 Rails.configuration.multisite
@@ -306,7 +306,7 @@ def migrate_to_s3
puts "*" * 30 + " DRY RUN " + "*" * 30 if dry_run
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
Some uploads were not migrated to the new scheme. Please run these commands in the rails console

1 comment on commit 503a11c

Please sign in to comment.
You can’t perform that action at this time.