diff options
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ac49d114ab..94e835bdf1 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -23,16 +23,13 @@ $:.unshift(File.dirname(__FILE__)) +$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") begin - require 'active_support' + require 'active_support' rescue LoadError - begin - require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' - rescue LoadError - require 'rubygems' - require_gem 'activesupport' - end + require 'rubygems' + require_gem 'activesupport' end require 'active_record/base' |