github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 12:17:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Wrong order for S3Helper#copy_file.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-08-08 15:57:58 +08:00
parent 0d45826d22
commit 1ea23b1eae
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/s3_helper.rb
View File

@ -33,8 +33,8 @@ class S3Helper
# copy the file in tombstone
if copy_to_tombstone && @tombstone_prefix.present?
self.copy(
File.join(@tombstone_prefix, s3_filename),
get_path_for_s3_upload(s3_filename)
get_path_for_s3_upload(s3_filename),
File.join(@tombstone_prefix, s3_filename)
)
end
@ -45,8 +45,8 @@ class S3Helper
def copy(source, destination)
s3_bucket
.object(source)
.copy_from(copy_source: File.join(@s3_bucket_name, destination))
.object(destination)
.copy_from(copy_source: File.join(@s3_bucket_name, source))
end
# make sure we have a cors config for assets