X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/984c6dc1142bbfaf11b1a2749d23f7edf7d1a83b..00bd64c7fb86d598eb9406e39f99fc711f58bf9b:/config/initializers/paperclip.rb?ds=sidebyside

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 0c9eb828f..4db3166ae 100644
--- 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