Merge branch 'develop'

Author: toastercup

lib/tasks/cortex.rake

@@ -221,9 +221,11 @@ namespace :cortex do
           object_key = media.attachment.arbitrary_url_for args[:old_path]
 
           begin
-            image = s3.get_object({bucket: ENV['S3_BUCKET_NAME'], key: object_key})
+            previous_filename = media.attachment_file_name
+            image = s3.get_object({bucket: ENV['S3_BUCKET_NAME'], key: object_key}).body
             puts "Re-saving image attachment #{media.id} - #{media.attachment_file_name}"
             media.attachment = image
+            media.attachment_file_name = previous_filename
             media.save
             # if there are multiple styles (thumbnail, etc), recreate them:
             media.attachment.reprocess!