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

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

diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 5c091f8..1612952 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -71,7 +71,9 @@ class S3Helper
     if !Rails.configuration.multisite
       options[:copy_source] = File.join(@s3_bucket_name, source)
     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
           source.split("/".freeze, 2)
         end

GitHub sha: 3e456d5c