diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-14 02:01:55 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-14 02:01:55 -0700 |
| commit | dd635ec70158b92961b6c5cc729c77ecaf9592be (patch) | |
| tree | aa8a9931fb6594d50744aaadae3f802184c4e4ec | |
| parent | 9a4fdff0af0ba05ad77096ce835aeb4bf343a53f (diff) | |
| download | rails-dd635ec70158b92961b6c5cc729c77ecaf9592be.tar.gz rails-dd635ec70158b92961b6c5cc729c77ecaf9592be.tar.bz2 rails-dd635ec70158b92961b6c5cc729c77ecaf9592be.zip | |
adds missing requires for arel and i18n, prevents Arel constant from being autoloaded (which was still seen), though it probably hides an issue related to dependencies
| -rw-r--r-- | activerecord/lib/active_record.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 8a1aa50e24..dd24099a4e 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -30,6 +30,8 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include require 'active_support' require 'active_model' +require 'arel' +require 'i18n' module ActiveRecord extend ActiveSupport::Autoload @@ -117,4 +119,4 @@ ActiveSupport.on_load(:active_record) do Arel::Table.engine = Arel::Sql::Engine.new(self) end -I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
\ No newline at end of file +I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml' |