Missing helper load error shouldn't shadow load errors within the helper itself.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb
index af5b2fc64c..3867329e29 100644
--- a/actionpack/lib/action_controller/helpers.rb
+++ b/actionpack/lib/action_controller/helpers.rb
@@ -78,8 +78,12 @@ module ActionController #:nodoc:
                 require_dependency(file_name)
               rescue LoadError => load_error
                 requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
-                msg = (requiree == file_name) ? "Missing helper file helpers/#{file_name}.rb" : "Can't load file: #{requiree}"
-                raise LoadError.new(msg).copy_blame!(load_error)
+                if requiree == file_name
+                  msg = "Missing helper file helpers/#{file_name}.rb"
+                  raise LoadError.new(msg).copy_blame!(load_error)
+                else
+                  raise
+                end
               end
 
               add_template_helper(class_name.constantize)