Skip to content

Commit

Permalink
cache_store and page_cache_directory are already defined in caching
Browse files Browse the repository at this point in the history
and pages
  • Loading branch information
josh committed Dec 2, 2009
1 parent 5d9af09 commit 75ae5bb
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions actionpack/lib/action_controller/metal/compatibility.rb
Expand Up @@ -46,11 +46,8 @@ class << self
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

Expand Down Expand Up @@ -116,7 +113,7 @@ def _find_layout(name, details)
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
Expand Down

0 comments on commit 75ae5bb

Please sign in to comment.