From 146a013c425cf4883fa320ab685fb869dda03733 Mon Sep 17 00:00:00 2001 From: wycats Date: Tue, 3 Aug 2010 12:50:13 -0700 Subject: [PATCH] Fix a couple of mistaken deprecation solutions --- activemodel/lib/active_model/validations.rb | 2 +- activemodel/lib/active_model/validations/callbacks.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 14e6ca0e30..2927654f5d 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -135,7 +135,7 @@ module ActiveModel ActiveSupport::Deprecation.warn(msg, caller) options = args.extract_options! options[:on] = :#{type} - validate(args.push(options), &block) + validate(*args.push(options), &block) end RUBY end diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index f46593b058..554c542f36 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -28,7 +28,7 @@ module ActiveModel module ClassMethods def before_validation(*args, &block) - options = args.last + options = args.extract_options! if options.is_a?(Hash) && options[:on] options[:if] = Array.wrap(options[:if]) options[:if] << "self.validation_context == :#{options[:on]}" @@ -53,7 +53,7 @@ module ActiveModel ActiveSupport::Deprecation.warn(msg, caller) options = args.extract_options! options[:on] = :#{on} - before_validation(args.push(options), &block) + before_validation(*args.push(options), &block) end RUBY end