Permalink
Browse files

Revert "correcting the documentation that default to false. it does n…

…ot default to false. returing either false or nil will not halt the chain unless :terminator is explicitly mentioned"

This reverts commit cd87cf7.

Reason: it does default to "false".
  • Loading branch information...
1 parent 86842fd commit 232218f46533a4f2512d522dc7c730eaf4cedd82 @fxn fxn committed Aug 5, 2010
Showing with 5 additions and 4 deletions.
  1. +5 −4 activesupport/lib/active_support/callbacks.rb
@@ -522,13 +522,14 @@ def reset_callbacks(symbol)
#
# This macro accepts the following options:
#
- # * <tt>:terminator</tt> - Indicates when a before filter is considered to be halted.
+ # * <tt>:terminator</tt> - Indicates when a before filter is considered
+ # to be halted.
#
# define_callbacks :validate, :terminator => "result == false"
#
- # In the example above, if any before validate callback returns +false+,
- # other callbacks are not executed. Note that in this case if the callback
- # returns +nil+ then other callbacks are still executed.
+ # In the example above, if any before validate callbacks returns +false+,
+ # other callbacks are not executed. Defaults to "false", meaning no value
+ # halts the chain.
#
# * <tt>:rescuable</tt> - By default, after filters are not executed if
# the given block or a before filter raises an error. Set this option to

0 comments on commit 232218f

Please sign in to comment.