aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-07-10 16:11:33 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2013-07-10 16:11:33 +0100
commit78f7d5b652000dbb1a11d34fe370c3fa82de840c (patch)
tree76a7c29973590ba87c53a26081b52d7ddaa10395 /activesupport
parent4d733d2dd4acd7fa8b8d5886f4ec9cac8321f96f (diff)
downloadrails-78f7d5b652000dbb1a11d34fe370c3fa82de840c.tar.gz
rails-78f7d5b652000dbb1a11d34fe370c3fa82de840c.tar.bz2
rails-78f7d5b652000dbb1a11d34fe370c3fa82de840c.zip
Add missing require so that DateTime has the right superclass
If the DateTime core extensions were loaded before the Date core extensions then you would get a superclass mismatch as DateTime hasn't been defined yet so it gets set to Object by the acts_like core extension. Fixes #11206
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/acts_like.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/acts_like.rb b/activesupport/lib/active_support/core_ext/date_time/acts_like.rb
index c79745c5aa..8fbbe0d3e9 100644
--- a/activesupport/lib/active_support/core_ext/date_time/acts_like.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/acts_like.rb
@@ -1,3 +1,4 @@
+require 'date'
require 'active_support/core_ext/object/acts_like'
class DateTime