diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2007-09-27 05:04:02 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2007-09-27 05:04:02 +0000 |
| commit | 5430eb6dcdeec7d43d7099c7b1c8fd3652647594 (patch) | |
| tree | a8b50f63793b360481f0ac49849f8f1b6b454081 /actionpack | |
| parent | 6f06ac6e1a2e2b3ebd9025c3e38b867e8279d6c9 (diff) | |
| download | rails-5430eb6dcdeec7d43d7099c7b1c8fd3652647594.tar.gz rails-5430eb6dcdeec7d43d7099c7b1c8fd3652647594.tar.bz2 rails-5430eb6dcdeec7d43d7099c7b1c8fd3652647594.zip | |
Avoid calling is_missing on LoadErrors. Closes #7460.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7644 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/helpers.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9bfa90dfd9..0d3cc564c4 100644 --- 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 index 251d32775f..401726b855 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -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 |