diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-10 05:24:53 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-10 05:24:53 -0700 |
| commit | af4b6545eef0035ea14e4d7480ade0a395aef1b8 (patch) | |
| tree | c72d493dce2451283b982e975dcb59400ed28a88 /actionpack/lib/abstract_controller | |
| parent | 261da32a84dafbe41aee82343db84d8868162d57 (diff) | |
| parent | e0438b1c071d8dc2c7fc87075485d4ac01f4eb07 (diff) | |
| download | rails-af4b6545eef0035ea14e4d7480ade0a395aef1b8.tar.gz rails-af4b6545eef0035ea14e4d7480ade0a395aef1b8.tar.bz2 rails-af4b6545eef0035ea14e4d7480ade0a395aef1b8.zip | |
Merge pull request #10642 from LTe/invalid-load-error
Show real LoadError on helpers require
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index 5ae8c6c3b0..a928205963 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -150,7 +150,12 @@ module AbstractController @error = error @path = "helpers/#{path}.rb" set_backtrace error.backtrace - super("Missing helper file helpers/%s.rb" % path) + + if error.path =~ /^#{path}(\.rb)?$/ + super("Missing helper file helpers/%s.rb" % path) + else + raise error + end end end |