aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-25 18:35:16 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-25 18:35:16 +0000
commit11611c1b002243a766c86c374b812c61a5b672c7 (patch)
treec7d9b38bc4df39e6f5d4ce3080acade92aed8b2d /actionpack/lib/action_controller
parentbe80d460f7389d3b5db7248cc4fb726fa61db4e4 (diff)
downloadrails-11611c1b002243a766c86c374b812c61a5b672c7.tar.gz
rails-11611c1b002243a766c86c374b812c61a5b672c7.tar.bz2
rails-11611c1b002243a766c86c374b812c61a5b672c7.zip
Raise LoadErrors separately
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@510 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb
index eb2b4fa7ab..e664ab2856 100644
--- a/actionpack/lib/action_controller/helpers.rb
+++ b/actionpack/lib/action_controller/helpers.rb
@@ -96,7 +96,7 @@ module ActionController #:nodoc:
inherited_without_helper(child)
begin
child.helper(child.controller_name)
- rescue Object
+ rescue NameError, LoadError
# No default helper available for this controller
end
end