aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-01-18 01:53:09 +0900
committerkennyj <kennyj@gmail.com>2012-01-18 01:53:09 +0900
commit6f8159c4217dc8433a2027ced0c61e7ce94551d3 (patch)
treed61c8f237d88fd5f8702a98f128e0d9ea58ae393 /actionpack
parent4280b20cde6d0ec4694f25288832d098c83cceba (diff)
downloadrails-6f8159c4217dc8433a2027ced0c61e7ce94551d3.tar.gz
rails-6f8159c4217dc8433a2027ced0c61e7ce94551d3.tar.bz2
rails-6f8159c4217dc8433a2027ced0c61e7ce94551d3.zip
Deprecate RAILS_CACHE constant.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/railtie.rb2
-rw-r--r--actionpack/lib/action_dispatch/http/rack_cache.rb5
2 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index fb810c41b1..a288e69649 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -14,7 +14,7 @@ module ActionController
end
initializer "action_controller.initialize_framework_caches" do
- ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
+ ActiveSupport.on_load(:action_controller) { self.cache_store ||= Rails.cache }
end
initializer "action_controller.assets_config", :group => :all do |app|
diff --git a/actionpack/lib/action_dispatch/http/rack_cache.rb b/actionpack/lib/action_dispatch/http/rack_cache.rb
index cc8edee300..003ae4029d 100644
--- a/actionpack/lib/action_dispatch/http/rack_cache.rb
+++ b/actionpack/lib/action_dispatch/http/rack_cache.rb
@@ -8,8 +8,7 @@ module ActionDispatch
new
end
- # TODO: Finally deal with the RAILS_CACHE global
- def initialize(store = RAILS_CACHE)
+ def initialize(store = Rails.cache)
@store = store
end
@@ -33,7 +32,7 @@ module ActionDispatch
new
end
- def initialize(store = RAILS_CACHE)
+ def initialize(store = Rails.cache)
@store = store
end