diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 3fd9a7dba8..9001ffb7fb 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,9 @@ *SVN* +* Allow sweepers to be created solely for expiring after controller actions, not model changes [DHH] + +* Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller [DHH] + * Give the legacy X-POST_DATA_FORMAT header greater precedence during params parsing for backward compatibility. [Jeremy Kemper] * Fixed that link_to with an href of # when using :method will not allow for click-through without JavaScript #7037 [stevenbristol/josh] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index f9f3c37c1c..75aa9df812 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -636,6 +636,11 @@ module ActionController #:nodoc: ActionController::Caching::Actions::ActionCachePath.path_for(controller, options) end + # Retrieve instance variables set in the controller. + def assigns(key) + controller.instance_variable_get("@#{key}") + end + private def callback(timing) controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}" |