AS::Callbacks: simplify logical statement

rails · May 17, 2012 · 8a72e7e · 8a72e7e
1 parent 4edb497
commit 8a72e7e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
@@ -310,13 +310,13 @@ def compile
         method << "value = nil"
         method << "halted = false"
 
-        callbacks = "value = yield if block_given? && !halted"
+        callbacks = "value = !halted && (!block_given? || yield)"
         reverse_each do |callback|
           callbacks = callback.apply(callbacks)
         end
         method << callbacks
 
-        method << "halted ? false : (block_given? ? value : true)"
+        method << "value"
         method.join("\n")
       end