lib/paperclip/storage/s3.rb in paperclip-3.4.2 vs lib/paperclip/storage/s3.rb in paperclip-3.5.0

@@ -162,9 +162,11 @@
 
       def expiring_url(time = 3600, style_name = default_style)
         if path
           base_options = { :expires => time, :secure => use_secure_protocol?(style_name) }
           s3_object(style_name).url_for(:read, base_options.merge(s3_url_options)).to_s
+        else
+          url
         end
       end
 
       def s3_credentials
         @s3_credentials ||= parse_credentials(@options[:s3_credentials])