Fix that Dates couldn't be subtracted from Dates after [5940].

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5954 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 5 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 f81cd9187e..b104e5271a 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -23,7 +23,11 @@ module ActiveSupport #:nodoc:
           end
           
           def minus_with_duration(other) #:nodoc:
-            self.plus_with_duration(-other)
+            if ActiveSupport::Duration === other
+              plus_with_duration(-other)
+            else
+              minus_without_duration(other)
+            end
           end
           
           # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with