diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:04:47 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:04:47 +0000 |
| commit | 0aad5abcc8f3893dd0664b0813fa6815f7e43527 (patch) | |
| tree | 58dda47f27506dcdd04393d6a79a4efa90479075 /activerecord | |
| parent | 02e382a765bea5632e56d80408ba20762e3ef334 (diff) | |
| download | rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.tar.gz rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.tar.bz2 rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.zip | |
AR, AP, and AM should look for AS in sibling directory before trying RubyGems #648
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@648 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 0541413625..04d16b41f3 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -27,8 +27,12 @@ $:.unshift(File.dirname(__FILE__)) begin require 'active_support' rescue LoadError - require 'rubygems' - require_gem 'activesupport' + begin + require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' + rescue LoadError + require 'rubygems' + require_gem 'activesupport' + end end require 'active_record/base' |