aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-01-01 21:22:20 +0100
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-01 14:28:57 -0800
commitabae712213f663b447d49e9b06001cf51e3b5811 (patch)
tree0fe8403916461442a5b082595a0c2b8691105af9
parent9ab528df8db1ad226888f3f99495dddd7ad8f912 (diff)
downloadrails-abae712213f663b447d49e9b06001cf51e3b5811.tar.gz
rails-abae712213f663b447d49e9b06001cf51e3b5811.tar.bz2
rails-abae712213f663b447d49e9b06001cf51e3b5811.zip
fixes a couple of wrong requires
-rw-r--r--activesupport/lib/active_support/cache/strategy/local_cache.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/object/to_param.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 66df7ad7f9..86c7703c27 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -1,5 +1,5 @@
require 'active_support/core_ext/object/duplicable'
-require 'active_support/inflector/methods active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/inflections'
module ActiveSupport
module Cache
diff --git a/activesupport/lib/active_support/core_ext/object/to_param.rb b/activesupport/lib/active_support/core_ext/object/to_param.rb
index 745c4d7dad..49e41e919a 100644
--- a/activesupport/lib/active_support/core_ext/object/to_param.rb
+++ b/activesupport/lib/active_support/core_ext/object/to_param.rb
@@ -1,4 +1,4 @@
-require 'active_support/core_ext/object/to_query'
+
class Object
# Alias of <tt>to_s</tt>.