Browse files

Merge commit '02df072d760610ff368658e85062afcc163f352b'

  • Loading branch information...
2 parents 95bc6bc + 02df072 commit f710c470c6c4bb9a021ed41993c1787e21642565 @technoweenie committed Feb 2, 2009
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/technoweenie/attachment_fu/backends/s3_backend.rb
View
1 lib/technoweenie/attachment_fu/backends/s3_backend.rb
@@ -276,6 +276,7 @@ def s3_url(thumbnail = nil)
# @photo.authenticated_s3_url('thumbnail', :expires_in => 5.hours, :use_ssl => true)
def authenticated_s3_url(*args)
options = args.extract_options!
+ options[:expires_in] = options[:expires_in].to_i if options[:expires_in]
thumbnail = args.shift
S3Object.url_for(full_filename(thumbnail), bucket_name, options)
end

0 comments on commit f710c47

Please sign in to comment.