Merge branch 'master' into moderation

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

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 75f6d237115ce98db0f511c7da073d434a502e7a..4db3166ae9a4419003f541bc53772ddc557e9dc6 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)
 
-      if url =~ /^\/assets\/(.*)$/
-        asset_path($1)
+      if url =~ %r{^/assets/(.*)$}
+        asset_path(Regexp.last_match(1))
       else
         url
       end