Avoid calling is_missing on LoadErrors. Closes #7460.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7644 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Sep 27, 2007 · 5430eb6 · 5430eb6
1 parent 6f06ac6
commit 5430eb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Avoid calling is_missing on LoadErrors. Closes #7460. [ntalbott]
+
 * Move Railties' Dispatcher to ActionController::Dispatcher, introduce before_ and after_dispatch callbacks, and warm up to non-CGI requests.  [Jeremy Kemper]
 
 * The tag helper may bypass escaping.  [Jeremy Kemper]

diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb
@@ -173,7 +173,7 @@ def default_helper_module!
           module_path = module_name.split('::').map { |m| m.underscore }.join('/')
           require_dependency module_path
           helper module_name.constantize
-        rescue LoadError => e
+        rescue MissingSourceFile => e
           raise unless e.is_missing? module_path
           logger.debug("#{name}: missing default helper path #{module_path}") if logger
         rescue NameError => e