diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-10-21 08:20:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 08:20:18 -0700 |
| commit | 4393406a8ac0d3c616210a96bca81dd6a12bf881 (patch) | |
| tree | efad2ae8b2eb7840c2325225a10da1ff74564ab3 /activesupport | |
| parent | 0a3595f64d772e0b0babd4c50535e7299c754724 (diff) | |
| parent | 267439205849bb15f3aa38361d8daece633f9bac (diff) | |
| download | rails-4393406a8ac0d3c616210a96bca81dd6a12bf881.tar.gz rails-4393406a8ac0d3c616210a96bca81dd6a12bf881.tar.bz2 rails-4393406a8ac0d3c616210a96bca81dd6a12bf881.zip | |
Merge pull request #26855 from headius/explicit_order_callback_args
Additional fix for argument-splat ordering differences.
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 9b9c9cbbdd..2ad1145fae 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -117,8 +117,8 @@ module ActiveSupport (skipped ||= []) << current next else - expanded = current.expand_call_template(env, invoke_sequence) - expanded.shift.send(*expanded, &expanded.shift) + target, block, method, *arguments = current.expand_call_template(env, invoke_sequence) + target.send(method, *arguments, &block) end current.invoke_after(env) skipped.pop.invoke_after(env) while skipped && skipped.first |