aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching
diff options
context:
space:
mode:
authorHongli Lai (Phusion) <hongli@phusion.nl>2008-08-27 11:39:06 +0200
committerHongli Lai (Phusion) <hongli@phusion.nl>2008-08-27 11:39:06 +0200
commit08704c442d15b16511214731dd94108b737ef407 (patch)
treed92d53f39245256dea6aa38a11500938adccf777 /actionpack/lib/action_controller/caching
parent920ad94598a9b90d048cb7cb19a34d7cb9e80392 (diff)
parent5db2f199aba9aa8d00adefa8237922ad684aca03 (diff)
downloadrails-08704c442d15b16511214731dd94108b737ef407.tar.gz
rails-08704c442d15b16511214731dd94108b737ef407.tar.bz2
rails-08704c442d15b16511214731dd94108b737ef407.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/caching')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index f3535f8330..b27ec486c0 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -38,8 +38,8 @@ module ActionController #:nodoc:
# caches_action :show, :cache_path => { :project => 1 }, :expires_in => 1.hour
# caches_action :feed, :cache_path => Proc.new { |controller|
# controller.params[:user_id] ?
- # controller.send(:user_list_url, c.params[:user_id], c.params[:id]) :
- # controller.send(:list_url, c.params[:id]) }
+ # controller.send(:user_list_url, controller.params[:user_id], controller.params[:id]) :
+ # controller.send(:list_url, controller.params[:id]) }
# end
#
# If you pass :layout => false, it will only cache your action content. It is useful when your layout has dynamic information.