diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-05 13:54:40 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-05 13:54:40 -0800 |
| commit | 798b5efedb7c6f10e606cf87546af34c1744e76f (patch) | |
| tree | 096b03b0972a630ec54e91840123a8a0eca76540 /actionpack/lib/abstract_controller/callbacks.rb | |
| parent | 4751cc21e8893f1cec827c8dcdf876db43e91556 (diff) | |
| parent | 2e487bc65816b1dec3d444a8a6f80aaef7eb68d3 (diff) | |
| download | rails-798b5efedb7c6f10e606cf87546af34c1744e76f.tar.gz rails-798b5efedb7c6f10e606cf87546af34c1744e76f.tar.bz2 rails-798b5efedb7c6f10e606cf87546af34c1744e76f.zip | |
Merge pull request #4333 from rafaelfranca/patch-1
Change more Array.wrap calls
Diffstat (limited to 'actionpack/lib/abstract_controller/callbacks.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 7004e607a1..fffe3edac2 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -167,7 +167,7 @@ module AbstractController # for details on the allowed parameters. def #{filter}_filter(*names, &blk) # def before_filter(*names, &blk) _insert_callbacks(names, blk) do |name, options| # _insert_callbacks(names, blk) do |name, options| - options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after} # options[:if] = (Array.wrap(options[:if]) << "!halted") if false + options[:if] = (Array(options[:if]) << "!halted") if #{filter == :after} # options[:if] = (Array(options[:if]) << "!halted") if false set_callback(:process_action, :#{filter}, name, options) # set_callback(:process_action, :before, name, options) end # end end # end @@ -176,7 +176,7 @@ module AbstractController # for details on the allowed parameters. def prepend_#{filter}_filter(*names, &blk) # def prepend_before_filter(*names, &blk) _insert_callbacks(names, blk) do |name, options| # _insert_callbacks(names, blk) do |name, options| - options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after} # options[:if] = (Array.wrap(options[:if]) << "!halted") if false + options[:if] = (Array(options[:if]) << "!halted") if #{filter == :after} # options[:if] = (Array(options[:if]) << "!halted") if false set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true)) # set_callback(:process_action, :before, name, options.merge(:prepend => true)) end # end end # end |