From a6a3dff4d4e16f03c704575917fb298b647dd2d5 Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Fri, 24 Feb 2012 11:52:58 +1100 Subject: [PATCH] Revert "Move AR railtie hook outside of initializer to avoid late inclusion of shim" This reverts commit 48fd72ae5b7134539c4aa17382186eefa120e8a2. --- lib/validates_timeliness/railtie.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/validates_timeliness/railtie.rb b/lib/validates_timeliness/railtie.rb index de13df6..6b4bb26 100644 --- a/lib/validates_timeliness/railtie.rb +++ b/lib/validates_timeliness/railtie.rb @@ -1,7 +1,10 @@ module ValidatesTimeliness class Railtie < Rails::Railtie initializer "validates_timeliness.initialize_active_record", :after => 'active_record.initialize_timezone' do - ValidatesTimeliness.default_timezone = ActiveRecord::Base.default_timezone + ActiveSupport.on_load(:active_record) do + ValidatesTimeliness.default_timezone = ActiveRecord::Base.default_timezone + ValidatesTimeliness.extend_orms = [ :active_record ] + end end initializer "validates_timeliness.initialize_restriction_errors" do @@ -9,7 +12,3 @@ module ValidatesTimeliness end end end - -ActiveSupport.on_load(:active_record) do - ValidatesTimeliness.extend_orms = [ :active_record ] -end