diff options
author | Xavier Noria <fxn@hashref.com> | 2010-08-05 22:46:04 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-08-05 22:46:04 +0200 |
commit | 232218f46533a4f2512d522dc7c730eaf4cedd82 (patch) | |
tree | 616fc25f3715b704a671f3d71e3d4d8e6d7ed068 | |
parent | 86842fd1ce2dd4dac75f1a05ece646eab80c9347 (diff) | |
download | rails-232218f46533a4f2512d522dc7c730eaf4cedd82.tar.gz rails-232218f46533a4f2512d522dc7c730eaf4cedd82.tar.bz2 rails-232218f46533a4f2512d522dc7c730eaf4cedd82.zip |
Revert "correcting the documentation that default to false. it does not default to false. returing either false or nil will not halt the chain unless :terminator is explicitly mentioned"
This reverts commit cd87cf771acb90c43cd56e5f038fc345a69790f9.
Reason: it does default to "false".
-rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index e179287b24..4950d009d1 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -522,13 +522,14 @@ module ActiveSupport # # 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 |