use Rails.root and Rails.env for their RAILS_* counterparts are remov…

…ed in rails3 rc.
handlino · Aug 17, 2010 · dc12411 · dc12411
1 parent ac8ec34
commit dc12411
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/lib/dm-paperclip/interpolations.rb b/lib/dm-paperclip/interpolations.rb
@@ -54,21 +54,19 @@ def timestamp attachment, style
     def web_root attachment, style
       if Object.const_defined?('Merb')
         merb_root(attachment, style)
-      elsif Object.const_defined("RAILS_ROOT")
+      elsif Object.const_defined('Rails')
         rails_root(attachment, style)
       else
         ""
       end
     end
 
-    # Returns the RAILS_ROOT constant.
     def rails_root attachment, style
-      Object.const_defined?('RAILS_ROOT') ? RAILS_ROOT : nil
+      Object.const_defined?('Rails') ? Rails.root : nil
     end
 
-    # Returns the RAILS_ENV constant.
     def rails_env attachment, style
-      Object.const_defined?('RAILS_ENV') ? RAILS_ENV : nil
+      Object.const_defined?('Rails') ? Rails.env : nil
     end
 
     def merb_root attachment, style