X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..19c2f6d485baf6ae5986a9eeaed412cb2e2039a1:/config/initializers/paperclip.rb

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index e27c46ea7..3aa1d003e 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -6,7 +6,7 @@ module Paperclip
       url = super(style_name, options)
 
       if url =~ %r{^/assets/(.*)$}
-        asset_path($1)
+        asset_path(Regexp.last_match(1))
       else
         url
       end
@@ -21,5 +21,5 @@ Rails.application.config.after_initialize do |_app|
 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