diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
| commit | 0c75ec51a9b60252125534b8f9a3f6406713a957 (patch) | |
| tree | 34165e93f7dd01157f77e4e70a46ec6a5bed77c8 /activemodel/lib/active_model/validations/callbacks.rb | |
| parent | 87398e531d0bb23b30787fe26d86678dba322895 (diff) | |
| parent | 2ffa50f5a9fac08e08869687006031b70322497a (diff) | |
| download | rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.gz rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.bz2 rails-0c75ec51a9b60252125534b8f9a3f6406713a957.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activemodel/lib/active_model/validations/callbacks.rb')
| -rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index afd65d3dd5..858cfda73e 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -40,7 +40,7 @@ module ActiveModel options = args.extract_options! options[:prepend] = true options[:if] = Array.wrap(options[:if]) - options[:if] << "!halted && value != false" + options[:if] << "!halted" options[:if] << "self.validation_context == :#{options[:on]}" if options[:on] set_callback(:validation, :after, *(args << options), &block) end |