diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-03-27 23:50:39 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-03-27 23:50:39 +0200 |
| commit | eea6a65488e3f590d4d9cd922f54febb151799ad (patch) | |
| tree | a3801ac70aa28d0c60cdc369e4d22b6c5014bbe5 /actionpack | |
| parent | 884e39f69eb8012b7ce455747d1b8aa7b34d83d3 (diff) | |
| parent | 6194c6d13b1349228baa85bf19b4f502011365a4 (diff) | |
| download | rails-eea6a65488e3f590d4d9cd922f54febb151799ad.tar.gz rails-eea6a65488e3f590d4d9cd922f54febb151799ad.tar.bz2 rails-eea6a65488e3f590d4d9cd922f54febb151799ad.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 2c8a6e4d4d..5fc6956266 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -56,19 +56,18 @@ module ActionController #:nodoc: # # caches_page :public # - # caches_action :index, :if => proc do |c| - # !c.request.format.json? # cache if is not a JSON request + # caches_action :index, :if => proc do + # !request.format.json? # cache if is not a JSON request # end # # caches_action :show, :cache_path => { :project => 1 }, # :expires_in => 1.hour # - # caches_action :feed, :cache_path => proc do |c| - # if c.params[:user_id] - # c.send(:user_list_url, - # c.params[:user_id], c.params[:id]) + # caches_action :feed, :cache_path => proc do + # if params[:user_id] + # user_list_url(params[:user_id, params[:id]) # else - # c.send(:list_url, c.params[:id]) + # list_url(params[:id]) # end # end # end |