diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/helpers.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 0cec212f98..e0ccd0b753 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix overly greedy rescues when loading helpers. Fixes #6268. [Nicholas Seckar] + * Fixed NumberHelper#number_with_delimiter to use "." always for splitting the original number, not the delimiter parameter #7389 [ceefour] * Autolinking recognizes trailing and embedded . , : ; #7354 [Jarkko Laine] diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb index dfc77851fc..4bea0c0fb9 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -110,9 +110,11 @@ module ActionController #:nodoc: module_path = module_name.split('::').map { |m| m.underscore }.join('/') require_dependency module_path helper module_name.constantize - rescue LoadError + rescue LoadError => e + raise unless e.is_missing? module_path logger.debug("#{name}: missing default helper path #{module_path}") if logger - rescue NameError + rescue NameError => e + raise unless e.missing_name? module_name logger.debug("#{name}: missing default helper module #{module_name}") if logger end |