mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Avoid calling is_missing on LoadErrors. Closes #7460.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7644 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
6f06ac6e1a
commit
5430eb6dcd
2 changed files with 3 additions and 1 deletions
|
@ -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 @@ module ActionController #:nodoc:
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue