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
2011-05-11 17:39:40 +00:00 · 2011-05-11 17:39:40 +00:00 · ea2da5f9ce
parent d0c93f7e49
commit ea2da5f9ce
1 changed files with 1 additions and 1 deletions
--- 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