2 files changed, 7 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 236055d77a..26a99658cc 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -103,7 +103,7 @@ class Date
   alias_method :minus_without_duration, :-
   alias_method :-, :minus_with_duration
 
-  # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with
+  # Provides precise Date calculations for years, months, and days. The +options+ parameter takes a hash with
   # any of these keys: <tt>:years</tt>, <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>.
   def advance(options)
     options = options.dup
diff --git a/activesupport/lib/active_support/core_ext/date/freeze.rb b/activesupport/lib/active_support/core_ext/date/freeze.rb
index 4edd715ba2..a731f8345e 100644
--- a/activesupport/lib/active_support/core_ext/date/freeze.rb
+++ b/activesupport/lib/active_support/core_ext/date/freeze.rb
@@ -5,7 +5,7 @@
 # first call will result in a frozen object error since the memo
 # instance variable is uninitialized.
 #
-# Work around by eagerly memoizing before freezing.
+# Work around by eagerly memoizing before the first freeze.
 #
 # Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
 # This hack is as close as we can get to feature detection:
@@ -17,9 +17,11 @@ if RUBY_VERSION < '1.9'
     if frozen_object_error.message =~ /frozen/
       class Date #:nodoc:
         def freeze
-          self.class.private_instance_methods(false).each do |m|
-            if m.to_s =~ /\A__\d+__\Z/
-              instance_variable_set(:"@#{m}", [send(m)])
+          unless frozen?
+            self.class.private_instance_methods(false).each do |m|
+              if m.to_s =~ /\A__\d+__\Z/
+                instance_variable_set(:"@#{m}", [send(m)])
+              end
             end
           end