X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2150a94cf2eb0d518a19769fc7582ea50a5f67b..f38824856d6eb3b51bc7c340deff487f5d49516d:/config/initializers/paperclip.rb

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 64673487a..4db3166ae 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -1,13 +1,12 @@
 module Paperclip
   class AssetUrlGenerator < UrlGenerator
-    include Sprockets::Helpers::IsolatedHelper
-    include Sprockets::Helpers::RailsHelper
+    include Sprockets::Rails::Helper
 
     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
@@ -15,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