Move more api-only methods into api_controller

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

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 75f6d237115ce98db0f511c7da073d434a502e7a..3aa1d003e354107cc672209daf8477bbe6827569 100644 (file)
--- 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)
 
     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
       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"
 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
 Paperclip::Attachment.default_options[:url_generator] = Paperclip::AssetUrlGenerator