diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-06 23:16:13 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-06 23:16:13 +0200 |
| commit | db520042b3fbb94fd12f9f8c0458f6b2cd5187a9 (patch) | |
| tree | cb52db780575ee5c27eeed90721258d1fac55ada /activesupport/lib | |
| parent | 2a04110f266b6ccaf94aeeae224af578a9620fbd (diff) | |
| parent | 3ca6988b782f7ae9da736b090fbf1edd8bc02fcb (diff) | |
| download | rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.tar.gz rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.tar.bz2 rails-db520042b3fbb94fd12f9f8c0458f6b2cd5187a9.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib')
| -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 |