From dd635ec70158b92961b6c5cc729c77ecaf9592be Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 14 Apr 2010 02:01:55 -0700 Subject: 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 --- activerecord/lib/active_record.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record.rb') 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' -- cgit v1.2.3 From 6be04c46316dae0abcdfc38f95f00315f418898f Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 14 Apr 2010 02:30:02 -0700 Subject: i18n -> AS/i18n --- activerecord/lib/active_record.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record.rb') diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index dd24099a4e..6a6485f35e 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -29,9 +29,9 @@ activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__) $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path) require 'active_support' +require 'active_support/i18n' require 'active_model' require 'arel' -require 'i18n' module ActiveRecord extend ActiveSupport::Autoload -- cgit v1.2.3