1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-12 11:52:01 +01:00

Reapply Yoann's patch from r7247 to the new tree

git-svn-id: file:///home/svn/framework3/trunk@10953 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
HD Moore 2010-11-08 22:51:29 +00:00
parent bed66d4f64
commit dc9274229a

View File

@ -151,17 +151,6 @@ module ActiveSupport #:nodoc:
raise
end
def require(file, *extras) #:nodoc:
if Dependencies.load?
Dependencies.new_constants_in(Object) { super }
else
super
end
rescue Exception => exception # errors from required file
exception.blame_file! file
raise
end
# Mark the given constant as unloadable. Unloadable constants are removed each
# time dependencies are cleared.
#