From c7f50e9a88c381cc274025c766e2edd1dff34d00 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Sun, 28 Jan 2007 04:57:05 +0000 Subject: 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/lib/action_controller/helpers.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller') 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 -- cgit v1.2.3