diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-08-21 00:51:06 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-08-21 00:51:06 -0500 |
| commit | 6be8251ec86b74b92e7bd922fafe9224281d2d26 (patch) | |
| tree | e8a87dd3524b3d80b381fc7dbb273a41c890dba2 /actionpack/lib | |
| parent | f388725bd61d8ae246c0c8e42eaec1a2be4620ac (diff) | |
| download | rails-6be8251ec86b74b92e7bd922fafe9224281d2d26.tar.gz rails-6be8251ec86b74b92e7bd922fafe9224281d2d26.tar.bz2 rails-6be8251ec86b74b92e7bd922fafe9224281d2d26.zip | |
Simplified and renamed CallbackChain union method to replace_or_append!
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index 7e46f572fe..bdae5f9d86 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -44,7 +44,7 @@ module ActionController def to_prepare(identifier = nil, &block) @prepare_dispatch_callbacks ||= ActiveSupport::Callbacks::CallbackChain.new callback = ActiveSupport::Callbacks::Callback.new(:prepare_dispatch, block, :identifier => identifier) - @prepare_dispatch_callbacks | callback + @prepare_dispatch_callbacks.replace_or_append!(callback) end # If the block raises, send status code as a last-ditch response. |