diff options
| author | Nicholas E. May (on Enterprise) <may@greentext.net> | 2010-10-03 18:06:22 -0500 |
|---|---|---|
| committer | Nicholas E. May (on Enterprise) <may@greentext.net> | 2010-10-03 18:06:22 -0500 |
| commit | 66559107e15dbbff8af0542c9107a4413f3769ea (patch) | |
| tree | 39aff389e9432718eca458e1e7911d1c22ae947a /activesupport | |
| parent | 467d20c897ba8e837b1ec67095482f57e8a78dfc (diff) | |
| parent | 860d7c566bd3041069c5763559341a1b6a2a1305 (diff) | |
| download | rails-66559107e15dbbff8af0542c9107a4413f3769ea.tar.gz rails-66559107e15dbbff8af0542c9107a4413f3769ea.tar.bz2 rails-66559107e15dbbff8af0542c9107a4413f3769ea.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 0c1d46c7ec..8f8def5922 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -459,12 +459,12 @@ module ActiveSupport # # becomes # - # dispatch_callback :before, :authenticate, :per_key => {:unless => proc {|c| c.action_name == "index"}} + # set_callback :process_action, :before, :authenticate, :per_key => {:unless => proc {|c| c.action_name == "index"}} # # Per-Key conditions are evaluated only once per use of a given key. # In the case of the above example, you would do: # - # run_callbacks(:dispatch, action_name) { ... dispatch stuff ... } + # run_callbacks(:process_action, action_name) { ... dispatch stuff ... } # # In that case, each action_name would get its own compiled callback # method that took into consideration the per_key conditions. This |