diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/callbacks.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/abstract_controller/callbacks_test.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb index dd4213e847..fd7e5ebfda 100644 --- a/actionpack/lib/action_controller/abstract/callbacks.rb +++ b/actionpack/lib/action_controller/abstract/callbacks.rb @@ -45,19 +45,19 @@ module AbstractController class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1 def #{filter}_filter(*names, &blk) _insert_callbacks(names, blk) do |name, options| - _set_callback(:process_action, :#{filter}, name, options) + set_callback(:process_action, :#{filter}, name, options) end end def prepend_#{filter}_filter(*names, &blk) _insert_callbacks(names, blk) do |name, options| - _set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true)) + set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true)) end end def skip_#{filter}_filter(*names, &blk) _insert_callbacks(names, blk) do |name, options| - _skip_callback(:process_action, :#{filter}, name, options) + skip_callback(:process_action, :#{filter}, name, options) end end diff --git a/actionpack/test/abstract_controller/callbacks_test.rb b/actionpack/test/abstract_controller/callbacks_test.rb index 826e76892e..32450257f0 100644 --- a/actionpack/test/abstract_controller/callbacks_test.rb +++ b/actionpack/test/abstract_controller/callbacks_test.rb @@ -8,7 +8,7 @@ module AbstractController end class Callback1 < ControllerWithCallbacks - _set_callback :process_action, :before, :first + set_callback :process_action, :before, :first def first @text = "Hello world" |