From 53018191054eb4c09107261b3eccb204f6db7e86 Mon Sep 17 00:00:00 2001 From: Paul van Tilburg Date: Thu, 6 Jun 2013 21:49:20 +0200 Subject: [PATCH] Fix the way the DATE_FORMATS are set to suit AR3.2 (closes: #9dfc93) --- stoptime.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stoptime.rb b/stoptime.rb index 3ced3ba..b59a6e1 100644 --- a/stoptime.rb +++ b/stoptime.rb @@ -39,13 +39,13 @@ unless defined? PUBLIC_DIR end # Set the default date(/time) format. - ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!( + Time::DATE_FORMATS.merge!( :default => "%Y-%m-%d %H:%M", :month_and_year => "%B %Y", :date_only => "%Y-%m-%d", :time_only => "%H:%M", :day_code => "%Y%m%d") - ActiveSupport::CoreExtensions::Date::Conversions::DATE_FORMATS.merge!( + Date::DATE_FORMATS.merge!( :default => "%Y-%m-%d", :month_and_year => "%B %Y") end