3 files changed, 6 insertions, 22 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index def0fdaa2f..ef8dbdb6e5 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1874,6 +1874,7 @@ module ActiveRecord #:nodoc:
     extend ActiveSupport::DescendantsTracker
 
     include ActiveModel::Conversion
+    include ActiveModel::Validations::Callbacks
     include Validations
     extend CounterCache
     include Locking::Optimistic, Locking::Pessimistic
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 44fee12001..42b56a3cf8 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -235,7 +235,7 @@ module ActiveRecord
     included do
       extend ActiveModel::Callbacks
 
-      define_callbacks :validation, :terminator => "result == false", :scope => [:kind, :name]
+      attr_accessor :validation_context
 
       define_model_callbacks :initialize, :find, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
@@ -250,28 +250,11 @@ module ActiveRecord
         end
       end
 
-      def before_validation(*args, &block)
-        options = args.last
-        if options.is_a?(Hash) && options[:on]
-          options[:if] = Array.wrap(options[:if])
-          options[:if] << "@_on_validate == :#{options[:on]}"
-        end
-        set_callback(:validation, :before, *args, &block)
-      end
-
-      def after_validation(*args, &block)
-        options = args.extract_options!
-        options[:prepend] = true
-        options[:if] = Array.wrap(options[:if])
-        options[:if] << "!halted && value != false"
-        options[:if] << "@_on_validate == :#{options[:on]}" if options[:on]
-        set_callback(:validation, :after, *(args << options), &block)
-      end
     end
 
     def valid?(*) #:nodoc:
-      @_on_validate = new_record? ? :create : :update
-      _run_validation_callbacks { super }
+      self.validation_context = new_record? ? :create : :update
+      super 
     end
 
     def destroy #:nodoc:
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index be64e00bd1..6ef9382b2a 100644
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -49,12 +49,12 @@ module ActiveRecord
     # Runs all the specified validations and returns true if no errors were added otherwise false.
     def valid?(context = nil)
       context ||= (new_record? ? :create : :update)
-      super(context)
+      output = super(context)
 
       deprecated_callback_method(:validate)
       deprecated_callback_method(:"validate_on_#{context}")
 
-      errors.empty?
+      errors.empty? && output
     end
 
   protected