From 5bc4740dec7ec9846915f7af459056d486b9c89d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 10 May 2013 10:53:46 -0700
Subject: fixing activemodel tests

---
 activesupport/lib/active_support/callbacks.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 141c246396..7c71524ffe 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -351,7 +351,8 @@ module ActiveSupport
 
       def compile
         callbacks = lambda { |env|
-          env.value = env.run_block.call if env.run_block && !env.halted
+          block = env.run_block
+          env.value = !env.halted && (!block || block.call)
           env
         }
         reverse_each do |callback|
-- 
cgit v1.2.3