fixed some Rails 2.1+ assumptions since I'm stuck on Rails 2.0.2 at t…

…he moment
herval · Feb 11, 2009 · 03a9945 · 03a9945
1 parent c94a269
commit 03a9945
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/init.rb b/init.rb
@@ -9,7 +9,7 @@
 # Fix RubyInline's permission problem,
 # RubyInline doesn't like directories with
 # group write permissions (like /tmp).
-ENV['INLINEDIR'] = File.join(Rails.root, 'tmp', 'rubyinline')
+ENV['INLINEDIR'] = File.join(Rails.respond_to?(:root) ? Rails.root : RAILS_ROOT, 'tmp', 'rubyinline')
 begin
   require 'inline'
   require File.dirname(__FILE__) + '/lib/optimizations'

diff --git a/lib/cache_fix.rb b/lib/cache_fix.rb
@@ -1,5 +1,6 @@
 # Because Rails' FileStore doesn't Marshal data
-if Rails.version == '2.1.0'
+rails_ver = Rails.respond_to?(:version) ? Rails.version : Rails::VERSION::STRING
+if rails_ver == '2.1.0'
 
   module ActiveSupport
     module Cache