diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-01 23:14:03 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-01 23:14:03 -0600 |
commit | 75ae5bb0228ec8d8a144030573db2fd998299042 (patch) | |
tree | 18d200bf58043cd90b0ffbade9bf2897204707e8 /actionpack/lib/action_controller | |
parent | 5d9af09563897bd36b4baaf9bb366cf100be90a9 (diff) | |
download | rails-75ae5bb0228ec8d8a144030573db2fd998299042.tar.gz rails-75ae5bb0228ec8d8a144030573db2fd998299042.tar.bz2 rails-75ae5bb0228ec8d8a144030573db2fd998299042.zip |
cache_store and page_cache_directory are already defined in caching
and pages
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index c251d79f4e..0c264fcd09 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -46,11 +46,8 @@ module ActionController cattr_accessor :use_accept_header self.use_accept_header = true - cattr_accessor :page_cache_directory self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : "" - cattr_reader :cache_store - cattr_accessor :consider_all_requests_local self.consider_all_requests_local = true @@ -116,7 +113,7 @@ module ActionController details[:prefix] = nil if name =~ /\blayouts/ super end - + # Move this into a "don't run in production" module def _default_layout(details, require_layout = false) super |