1 files changed, 3 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb
index 22a77320dc..c39c85e1af 100644
--- a/activemodel/lib/active_model/validations/callbacks.rb
+++ b/activemodel/lib/active_model/validations/callbacks.rb
@@ -23,14 +23,14 @@ module ActiveModel
 
       included do
         include ActiveSupport::Callbacks
-        define_callbacks :validation, :terminator => "result == false", :scope => [:kind, :name]
+        define_callbacks :validation, :terminator => "result == false", :skip_after_callbacks_if_terminated => true, :scope => [:kind, :name]
       end
 
       module ClassMethods
         def before_validation(*args, &block)
           options = args.last
           if options.is_a?(Hash) && options[:on]
-            options[:if] = Array.wrap(options[:if])
+            options[:if] = Array(options[:if])
             options[:if].unshift("self.validation_context == :#{options[:on]}")
           end
           set_callback(:validation, :before, *args, &block)
@@ -39,8 +39,7 @@ module ActiveModel
         def after_validation(*args, &block)
           options = args.extract_options!
           options[:prepend] = true
-          options[:if] = Array.wrap(options[:if])
-          options[:if] << "!halted"
+          options[:if] = Array(options[:if])
           options[:if].unshift("self.validation_context == :#{options[:on]}") if options[:on]
           set_callback(:validation, :after, *(args << options), &block)
         end