aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-05-24 16:42:10 +0000
committerRick Olson <technoweenie@gmail.com>2007-05-24 16:42:10 +0000
commit4b9e67c5b9d9f751d633c787d24a1491f3ef498e (patch)
tree3c38ead0fc84c43cdf24ec42abc1a9d6584b5862 /actionpack/lib
parentda7f9f516a8f34303ae08a9b89502757b41a578a (diff)
downloadrails-4b9e67c5b9d9f751d633c787d24a1491f3ef498e.tar.gz
rails-4b9e67c5b9d9f751d633c787d24a1491f3ef498e.tar.bz2
rails-4b9e67c5b9d9f751d633c787d24a1491f3ef498e.zip
catch possible WSOD when trying to render a missing partial. Closes #8454 [Catfish]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6826 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/base.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 69db2772bb..f6885fa292 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -278,6 +278,10 @@ module ActionView #:nodoc:
template_source = nil # Don't read the source until we know that it is required
+ if template_file_name.blank?
+ raise ActionViewError, "Couldn't find template file for #{template_path} in #{@view_paths.inspect}"
+ end
+
begin
render_template(template_extension, template_source, template_file_name, local_assigns)
rescue Exception => e