diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-02-25 02:11:46 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-02-25 02:11:46 -0800 |
| commit | d5141f208e10378ebe3195fa7a9ff523a1296461 (patch) | |
| tree | 5054663374c12305ffb1f0e46bb088596fbb39ff /activesupport/lib | |
| parent | f80a6a5a39e2ec135bc0ddbdaec23979b84ef22d (diff) | |
| parent | fa891a2b9dd5548d17ce3609d64142b6e31d2410 (diff) | |
| download | rails-d5141f208e10378ebe3195fa7a9ff523a1296461.tar.gz rails-d5141f208e10378ebe3195fa7a9ff523a1296461.tar.bz2 rails-d5141f208e10378ebe3195fa7a9ff523a1296461.zip | |
Merge pull request #9390 from chris-baynes/datetime_sec_fraction
Keep second fraction when DateTime#change is called.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index 97aad008f5..9f0864d9bb 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -59,7 +59,7 @@ class DateTime options.fetch(:day, day), options.fetch(:hour, hour), options.fetch(:min, options[:hour] ? 0 : min), - options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec), + options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec + sec_fraction), options.fetch(:offset, offset), options.fetch(:start, start) ) |