Allow apache to control the HSTS setting

[rails.git] / config / initializers / paperclip.rb

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 0c9eb828fbababb45e65d2f3b6b52d473042b053..4db3166ae9a4419003f541bc53772ddc557e9dc6 100644 (file)
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -5,8 +5,8 @@ module Paperclip
     def for(style_name, options)
       url = super(style_name, options)
 
-      if url =~ /^\/assets\/(.*)$/
-        asset_path($1)
+      if url =~ %r{^/assets/(.*)$}
+        asset_path(Regexp.last_match(1))
       else
         url
       end
@@ -14,6 +14,12 @@ module Paperclip
   end
 end
 
+Rails.application.config.after_initialize do |_app|
+  Paperclip::AssetUrlGenerator::VIEW_ACCESSORS.each do |attr|
+    Paperclip::AssetUrlGenerator.send("#{attr}=", ActionView::Base.send(attr))
+  end
+end
+
 Paperclip::Attachment.default_options[:url] = "/attachments/:class/:attachment/:id_partition/:style/:fingerprint.:extension"
 Paperclip::Attachment.default_options[:path] = "#{ATTACHMENTS_DIR}/:class/:attachment/:id_partition/:style/:fingerprint.:extension"
 Paperclip::Attachment.default_options[:url_generator] = Paperclip::AssetUrlGenerator