mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
d0360a4d5c
commit
6435ecc68a
1 changed files with 6 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue