Merge remote-tracking branch 'openstreetmap/pull/1030' into next
[rails.git] / config / initializers / paperclip.rb
index 592c9e1871cab00d7290d3447e4fac265cfede69..4db3166ae9a4419003f541bc53772ddc557e9dc6 100644 (file)
@@ -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,7 +14,7 @@ module Paperclip
   end
 end
 
-Rails.application.config.after_initialize do |app|
+Rails.application.config.after_initialize do |_app|
   Paperclip::AssetUrlGenerator::VIEW_ACCESSORS.each do |attr|
     Paperclip::AssetUrlGenerator.send("#{attr}=", ActionView::Base.send(attr))
   end