aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2010-01-19 22:35:09 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2010-01-19 22:35:26 -0800
commit1a50d2e66a80c910fe1e2203eb2c993e5dbc4e5b (patch)
tree57994f2048b69feb96ffa33ca6d084daec26b47c /actionpack/lib/action_controller
parent5ebfa6242726bd186452640ed5704f2adc1a5007 (diff)
downloadrails-1a50d2e66a80c910fe1e2203eb2c993e5dbc4e5b.tar.gz
rails-1a50d2e66a80c910fe1e2203eb2c993e5dbc4e5b.tar.bz2
rails-1a50d2e66a80c910fe1e2203eb2c993e5dbc4e5b.zip
Stop overriding LoadError.new to return a MissingSourceError (and sometimes nil!)
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index d0402e5bad..cdd14560e1 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -100,7 +100,7 @@ module ActionController
module_path = module_name.underscore
helper module_path
rescue MissingSourceFile => e
- raise e unless e.is_missing? "#{module_path}_helper"
+ raise e unless e.is_missing? "helpers/#{module_path}_helper"
rescue NameError => e
raise e unless e.missing_name? "#{module_name}Helper"
end