Update to iD v1.8.5

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

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 592c9e1871cab00d7290d3447e4fac265cfede69..e27c46ea70a406fd08425cec7be982de97021e88 100644 (file)
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -5,7 +5,7 @@ module Paperclip
     def for(style_name, options)
       url = super(style_name, options)
 
     def for(style_name, options)
       url = super(style_name, options)
 

-      if url =~ /^\/assets\/(.*)$/
+      if url =~ %r{^/assets/(.*)$}

         asset_path($1)
       else
         url
         asset_path($1)
       else
         url


@@ -14,7 +14,7 @@ module Paperclip
   end
 end
 
   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
   Paperclip::AssetUrlGenerator::VIEW_ACCESSORS.each do |attr|
     Paperclip::AssetUrlGenerator.send("#{attr}=", ActionView::Base.send(attr))
   end