From 589cef086fd06df80bcf988a014c7b6628013039 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Mon, 30 Nov 2015 14:19:30 +0000
Subject: Avoid dummy_time_value to add "2000-01-01" twice
---
activemodel/lib/active_model/type/time.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'activemodel')
diff --git a/activemodel/lib/active_model/type/time.rb b/activemodel/lib/active_model/type/time.rb
index 7101bad566..fe09f63a87 100644
--- a/activemodel/lib/active_model/type/time.rb
+++ b/activemodel/lib/active_model/type/time.rb
@@ -29,7 +29,11 @@ module ActiveModel
return value unless value.is_a?(::String)
return if value.empty?
- dummy_time_value = "2000-01-01 #{value}"
+ if value =~ /^2000-01-01/
+ dummy_time_value = value
+ else
+ dummy_time_value = "2000-01-01 #{value}"
+ end
fast_string_to_time(dummy_time_value) || begin
time_hash = ::Date._parse(dummy_time_value)
--
cgit v1.2.3