From ea2da5f9ced6ed168cd4e8a2925548c5edd0b3a0 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Wed, 11 May 2011 17:39:40 +0000 Subject: [PATCH] Applies a patch to fix autoload + active_support conflicts: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2283-unnecessary-exception-raised-in-asdependenciesload_missing_constant git-svn-id: file:///home/svn/framework3/trunk@12583 4d416f70-5f16-0410-b530-b9f4589650da --- lib/active_support/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_support/dependencies.rb b/lib/active_support/dependencies.rb index 15d32dc11e..3976bb6bee 100644 --- a/lib/active_support/dependencies.rb +++ b/lib/active_support/dependencies.rb @@ -403,7 +403,7 @@ module ActiveSupport #:nodoc: raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!" end - raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name) + return from_mod.const_get(const_name) if uninherited_const_defined?(from_mod, const_name) qualified_name = qualified_name_for from_mod, const_name path_suffix = qualified_name.underscore