diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2010-09-05 21:20:54 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-06 13:39:55 +0200 |
commit | 9b610049bb4f73dbcdc670879683ec2a1a2ab780 (patch) | |
tree | f93f129985ed38eb8bd578ca52d16aae21192377 /activerecord/lib/active_record/validations.rb | |
parent | a18b73b43c07d031c9a660bc119835dcb6db85cf (diff) | |
download | rails-9b610049bb4f73dbcdc670879683ec2a1a2ab780.tar.gz rails-9b610049bb4f73dbcdc670879683ec2a1a2ab780.tar.bz2 rails-9b610049bb4f73dbcdc670879683ec2a1a2ab780.zip |
Cleanup deprecation warnings in active record
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/validations.rb')
-rw-r--r-- | activerecord/lib/active_record/validations.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index b98fd353aa..e4c366ea63 100644 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -53,24 +53,13 @@ module ActiveRecord def valid?(context = nil) context ||= (new_record? ? :create : :update) output = super(context) - - deprecated_callback_method(:validate) - deprecated_callback_method(:"validate_on_#{context}") - errors.empty? && output end protected def perform_validations(options={}) - perform_validation = case options - when Hash - options[:validate] != false - else - ActiveSupport::Deprecation.warn "save(#{options}) is deprecated, please give save(:validate => #{options}) instead", caller - options - end - + perform_validation = options[:validate] != false if perform_validation valid?(options.is_a?(Hash) ? options[:context] : nil) else |