diff options
| author | Yasuo Honda <yasuo.honda@gmail.com> | 2015-11-30 14:19:30 +0000 |
|---|---|---|
| committer | Yasuo Honda <yasuo.honda@gmail.com> | 2015-11-30 20:04:46 +0000 |
| commit | 589cef086fd06df80bcf988a014c7b6628013039 (patch) | |
| tree | bcce8bdc1606645b4b36103704393d777bdf9429 /activemodel | |
| parent | 4687e59d5c941f57e39376d2011ce811eb18d47a (diff) | |
| download | rails-589cef086fd06df80bcf988a014c7b6628013039.tar.gz rails-589cef086fd06df80bcf988a014c7b6628013039.tar.bz2 rails-589cef086fd06df80bcf988a014c7b6628013039.zip | |
Avoid dummy_time_value to add "2000-01-01" twice
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/type/time.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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) |