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

FIX: Remapping during restore was wrong for CDN URLs

This commit is contained in:
Gerhard Schlager 2019-07-09 17:34:41 +02:00
parent 4c1b8c7559
commit 5f0d38341e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/backup_restore/restorer.rb
View File

@ -458,7 +458,7 @@ module BackupRestore
def remap_uploads(previous_db_name, current_db_name)
log "Remapping uploads..."
was_multisite = BackupMetadata.value_for("multisite") == "true"
was_multisite = BackupMetadata.value_for("multisite") == "t"
uploads_folder = was_multisite ? "/" : "/uploads/#{current_db_name}/"
if (old_base_url = BackupMetadata.value_for("base_url")) && old_base_url != Discourse.base_url
@ -476,16 +476,16 @@ module BackupRestore
DbHelper.remap("#{old_s3_cdn_url}/", UrlHelper.schemaless("#{base_url}#{uploads_folder}"))
old_host = URI.parse(old_s3_cdn_url).host
new_host = URI.parse(base_url.presence || Discourse.base_url).host
new_host = URI.parse(base_url).host
DbHelper.remap(old_host, new_host)
end
if (old_cdn_url = BackupMetadata.value_for("cdn_url")) && old_cdn_url != Discourse.asset_host
base_url = SiteSetting.Upload.enable_s3_uploads ? SiteSetting.Upload.s3_base_url : Discourse.base_url
base_url = Discourse.asset_host || Discourse.base_url
DbHelper.remap("#{old_cdn_url}/", UrlHelper.schemaless("#{base_url}/"))
old_host = URI.parse(old_cdn_url).host
new_host = URI.parse(base_url.presence || Discourse.base_url).host
new_host = URI.parse(base_url).host
DbHelper.remap(old_host, new_host)
end