aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-22 17:00:33 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-22 17:07:04 -0700
commitb2d6fdae353be4fca41d7ac1839f30d9737162fd (patch)
tree168675745b5001d8a5b807d0102d3a1cdd639f3d /activesupport
parent7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff)
downloadrails-b2d6fdae353be4fca41d7ac1839f30d9737162fd.tar.gz
rails-b2d6fdae353be4fca41d7ac1839f30d9737162fd.tar.bz2
rails-b2d6fdae353be4fca41d7ac1839f30d9737162fd.zip
Fix tests on 1.9
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/class/attribute_accessors.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/class/delegating_attributes.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
index 75e481fc54..74ce85a1c2 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array/extract_options'
+
# Extends the class object with class and instance accessors for class attributes,
# just like the native attr* accessors for instance attributes.
#
diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index b0784d8416..fd029544c3 100644
--- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/blank'
+require 'active_support/core_ext/object/blank'
class Class
def superclass_delegating_reader(*names)