diff options
| author | Charles Oliver Nutter <headius@headius.com> | 2016-10-21 10:16:58 -0500 |
|---|---|---|
| committer | Charles Oliver Nutter <headius@headius.com> | 2016-10-21 10:16:58 -0500 |
| commit | 267439205849bb15f3aa38361d8daece633f9bac (patch) | |
| tree | a702a88b88e1441bb98e1ce33953e4f265552581 /activesupport | |
| parent | 5f382d41c30b1e433d777a8daaedb247d7f2a57c (diff) | |
| download | rails-267439205849bb15f3aa38361d8daece633f9bac.tar.gz rails-267439205849bb15f3aa38361d8daece633f9bac.tar.bz2 rails-267439205849bb15f3aa38361d8daece633f9bac.zip | |
Additional fix for argument-splat ordering differences.
See #26854
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 |