From cb321546b7aef33fcf5466b61f79bd9198cd12b5 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 1 Jul 2010 19:03:18 -0300 Subject: Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [#4979 state:committed] Signed-off-by: José Valim --- activesupport/lib/active_support/json/encoding.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/json/encoding.rb') diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 3f266d1e96..dbce7e710a 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -9,7 +9,7 @@ require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/hash/except' require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/object/instance_variables' -require 'active_support/time' +require 'time' module ActiveSupport class << self @@ -212,7 +212,7 @@ class Time if ActiveSupport.use_standard_json_time_format xmlschema else - %(#{strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}) + strftime("%Y/%m/%d %H:%M:%S %z") end end end -- cgit v1.2.3