Merge branch 'master' of git@github.com:josh/rails

activesupport/lib/active_support/callbacks.rb

@@ -97,15 +97,14 @@ def run(object, options = {}, &terminator)
       end
 
       def |(chain)
-        if chain.is_a?(Callback)
-          if found_callback = find(chain)
-            index = index(found_callback)
+        if chain.is_a?(CallbackChain)
+          chain.each { |callback| self | callback }
+        elsif chain.is_a?(Callback)
+          if index = index(chain)
             self[index] = chain
           else
             self << chain
           end
-        else
-          chain.each { |callback| self | callback }
         end
         self
       end
@@ -115,7 +114,7 @@ def find(callback, &block)
       end
 
       def delete(callback)
-        super(find(callback))
+        super(callback.is_a?(Callback) ? callback : find(callback))
       end
 
       private