RAILS_ROOT -> Rails.root

bsiggelkow · Jan 13, 2010 · 7263d05 · 7263d05
1 parent 058455c
commit 7263d05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/thinking_sphinx/configuration.rb b/lib/thinking_sphinx/configuration.rb
@@ -87,7 +87,7 @@ def reset(custom_app_root=nil)
       if custom_app_root
         self.app_root = custom_app_root
       else
-        self.app_root          = RAILS_ROOT if defined?(RAILS_ROOT)
+        self.app_root          = Rails.root if defined?(Rails)
         self.app_root          = Merb.root  if defined?(Merb)
         self.app_root        ||= app_root
       end

diff --git a/lib/thinking_sphinx/tasks.rb b/lib/thinking_sphinx/tasks.rb
@@ -2,7 +2,7 @@
 
 namespace :thinking_sphinx do
   task :app_env do
-    if defined?(RAILS_ROOT)
+    if defined?(Rails)
       Rake::Task[:environment].invoke
       Rails.configuration.cache_classes = false
     end