aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-06-02 22:02:43 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-06-02 22:02:43 -0500
commit64fea9c45c515496bb60df4a1e141f44cac4d158 (patch)
tree0da66f85c390b552c6c46a83bf27b76e20ba5e51 /activesupport/lib/active_support/core_ext
parente7a305f08d8f72f81449e1d8934fba31f038ad88 (diff)
downloadrails-64fea9c45c515496bb60df4a1e141f44cac4d158.tar.gz
rails-64fea9c45c515496bb60df4a1e141f44cac4d158.tar.bz2
rails-64fea9c45c515496bb60df4a1e141f44cac4d158.zip
Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-rw-r--r--activesupport/lib/active_support/core_ext/date/calculations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 1e2dbf118e..b5180c9592 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -184,7 +184,7 @@ module ActiveSupport #:nodoc:
# Returns a new Date/DateTime representing the end of the quarter (last day of march, june, september, december; DateTime objects will have time set to 23:59:59)
def end_of_quarter
- change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
+ beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
end
alias :at_end_of_quarter :end_of_quarter