diff options
| author | Manuel Menezes de Sequeira <MMSequeira@gmail.com> | 2011-10-06 21:31:26 +0100 |
|---|---|---|
| committer | Manuel Menezes de Sequeira <MMSequeira@gmail.com> | 2011-10-06 21:31:26 +0100 |
| commit | a17e5e24624d27467e3d7a52ff83c00140890557 (patch) | |
| tree | 96ea19c3b0b23f0782910384c476d2662471ed73 /actionpack/lib/abstract_controller | |
| parent | 29bf193cadae8c0b01f565caed75eb285ba8c958 (diff) | |
| parent | 545ddbdbc5b61716fb884488206567a130902f0a (diff) | |
| download | rails-a17e5e24624d27467e3d7a52ff83c00140890557.tar.gz rails-a17e5e24624d27467e3d7a52ff83c00140890557.tar.bz2 rails-a17e5e24624d27467e3d7a52ff83c00140890557.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -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 14c984e41f..7004e607a1 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -177,7 +177,7 @@ module AbstractController 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 - set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true)) # set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true)) + set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true)) # set_callback(:process_action, :before, name, options.merge(:prepend => true)) end # end end # end @@ -185,7 +185,7 @@ module AbstractController # for details on the allowed parameters. def skip_#{filter}_filter(*names, &blk) # def skip_before_filter(*names, &blk) _insert_callbacks(names, blk) do |name, options| # _insert_callbacks(names, blk) do |name, options| - skip_callback(:process_action, :#{filter}, name, options) # skip_callback(:process_action, :#{filter}, name, options) + skip_callback(:process_action, :#{filter}, name, options) # skip_callback(:process_action, :before, name, options) end # end end # end |