Fix overly greedy rescues when loading helpers. Closes #6268

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6052 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

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]

actionpack/lib/action_controller/helpers.rb

@@ -110,9 +110,11 @@ def default_helper_module!
           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