github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 23:11:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: don't include multisite upload path to source URL if already exist.

Browse Source
This commit is contained in:
Vinoth Kannan
2019-08-02 07:57:27 +05:30
parent a1fc35fdf7
commit 3e456d5c0b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/s3_helper.rb
View File

@ -71,7 +71,9 @@ class S3Helper
if !Rails.configuration.multisite if !Rails.configuration.multisite
options[:copy_source] = File.join(@s3_bucket_name, source) options[:copy_source] = File.join(@s3_bucket_name, source)
else else
if @s3_bucket_folder_path if source.include?(multisite_upload_path) || source.include?(@tombstone_prefix)
options[:copy_source] = File.join(@s3_bucket_name, source)
elsif @s3_bucket_folder_path
folder, filename = begin folder, filename = begin
source.split("/".freeze, 2) source.split("/".freeze, 2)
end end