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

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 592c9e187..3aa1d003e 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,12 +14,12 @@ 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
 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[:path] = "#{Settings.attachments_dir}/:class/:attachment/:id_partition/:style/:fingerprint.:extension"
 Paperclip::Attachment.default_options[:url_generator] = Paperclip::AssetUrlGenerator