diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-10 10:57:35 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-10 10:57:35 -0700 |
| commit | 4f940820f29f8fc9c9113baca709aae11683b596 (patch) | |
| tree | 4eb18543c11196265ec51d59166d7ead2489cebf /actionpack/lib | |
| parent | a3f390b569c3b7b4e51554043a2262f2bce652e9 (diff) | |
| parent | 55cbb85fb7b7f4eaaa681e2a74cc8aca225097b7 (diff) | |
| download | rails-4f940820f29f8fc9c9113baca709aae11683b596.tar.gz rails-4f940820f29f8fc9c9113baca709aae11683b596.tar.bz2 rails-4f940820f29f8fc9c9113baca709aae11683b596.zip | |
Merge pull request #11799 from njakobsen/fix-controller-filter-callbacks
Execute conditional procs on controller filters only for current action
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 21c6191691..d6c941832f 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -38,7 +38,7 @@ module AbstractController def _normalize_callback_option(options, from, to) # :nodoc: if from = options[from] from = Array(from).map {|o| "action_name == '#{o}'"}.join(" || ") - options[to] = Array(options[to]) << from + options[to] = Array(options[to]).unshift(from) end end |