Permalink
Browse files

Avoid calling is_missing on LoadErrors. Closes #7460.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7644 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 6f06ac6 commit 5430eb6dcdeec7d43d7099c7b1c8fd3652647594 @seckar seckar committed Sep 27, 2007
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +1 −1 actionpack/lib/action_controller/helpers.rb
View
@@ -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]
@@ -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

0 comments on commit 5430eb6

Please sign in to comment.