aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-02-05 15:52:16 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2011-02-06 17:55:38 -0200
commit10cab35d3b9e87e4b182162f7783c220cf2a937f (patch)
tree6b1a2f6a7d4c9705312aa4c96b5ea786923e30bd /actionpack/lib/action_controller
parentcf9324e5909e71ec0a2477338e696b6af2f17f13 (diff)
downloadrails-10cab35d3b9e87e4b182162f7783c220cf2a937f.tar.gz
rails-10cab35d3b9e87e4b182162f7783c220cf2a937f.tar.bz2
rails-10cab35d3b9e87e4b182162f7783c220cf2a937f.zip
Allow page_cache_directory to be set as a Pathname
For example, page_cache_directory = Rails.root.join("public/cache") Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/caching/pages.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 3e57d2c236..8c583c7ce0 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -106,7 +106,7 @@ module ActionController #:nodoc:
end
def page_cache_path(path, extension = nil)
- page_cache_directory + page_cache_file(path, extension)
+ page_cache_directory.to_s + page_cache_file(path, extension)
end
def instrument_page_cache(name, path)