From 58a5eef53eee7768d68cc034a1563914d21a68cb Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 5 Oct 2007 09:43:24 +0000 Subject: Disambiguate Time, Date, and DateTime#to_json formatting. Closes #9750. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7746 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/json/encoders/date_time.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/json/encoders/date_time.rb') diff --git a/activesupport/lib/active_support/json/encoders/date_time.rb b/activesupport/lib/active_support/json/encoders/date_time.rb index 229cefc007..f0b0434412 100644 --- a/activesupport/lib/active_support/json/encoders/date_time.rb +++ b/activesupport/lib/active_support/json/encoders/date_time.rb @@ -1,5 +1,5 @@ class DateTime def to_json(options = nil) #:nodoc: - %("#{strftime("%m/%d/%Y %H:%M:%S %Z")}") + %("#{strftime("%Y/%m/%d %H:%M:%S %z")}") end end -- cgit v1.2.3