aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-16 13:54:02 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-16 13:54:02 -0200
commitb7a7e82207efd24d685fc1325fb523f047ca2ce1 (patch)
tree4fdaf223271dcb9eed500ed184365bdc4b159629 /actionpack
parentcf01e4e797e0c9162686babbb670f84481305d98 (diff)
parent21f4017fd904532ebe4964481567d69636a711cf (diff)
downloadrails-b7a7e82207efd24d685fc1325fb523f047ca2ce1.tar.gz
rails-b7a7e82207efd24d685fc1325fb523f047ca2ce1.tar.bz2
rails-b7a7e82207efd24d685fc1325fb523f047ca2ce1.zip
Merge pull request #22598 from yui-knk/deprecate_string_callback
Deprecate passing string to define callback.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/callbacks.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index d5317e4717..d63ce9c1c3 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -48,7 +48,8 @@ module AbstractController
def _normalize_callback_option(options, from, to) # :nodoc:
if from = options[from]
- from = Array(from).map {|o| "action_name == '#{o}'"}.join(" || ")
+ _from = Array(from).map(&:to_s).to_set
+ from = proc {|c| _from.include? c.action_name }
options[to] = Array(options[to]).unshift(from)
end
end