github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 00:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joshua Peek
2008-04-18 17:14:52 -05:00
parent 36eecda8d0 a4c15303cb
commit 29ea0f68aa
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
activesupport/lib/active_support/callbacks.rb
View File

@@ -97,15 +97,14 @@ module ActiveSupport
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 @@ module ActiveSupport
end
def delete(callback)
super(find(callback))
super(callback.is_a?(Callback) ? callback : find(callback))
end
private