From e714b25723b674bb6d66af40ea9047166907616b Mon Sep 17 00:00:00 2001
From: Nicholas Seckar <nseckar@gmail.com>
Date: Tue, 4 Apr 2006 19:37:29 +0000
Subject: Update the diagnostics template skip the useless '<controller not
 set>' text. Fix symbol extensions test case. Clean paths inside of exception
 messages and traces. Add Pathname.clean_within for cleaning all the paths
 inside of a string.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4158 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 .../lib/action_controller/templates/rescues/diagnostics.rhtml       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/templates/rescues')

diff --git a/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml b/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml
index 584659252a..fa48b62f6f 100644
--- a/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml
@@ -1,6 +1,8 @@
 <h1>
-  <%=h @exception.class.to_s %> in
-  <%=h (@request.parameters["controller"] || "<controller not set>").capitalize %>#<%=h @request.parameters["action"] || "<action not set>" %>
+  <%=h @exception.class.to_s %>
+  <% if @request.parameters['controller'] %>
+    in <%=h @request.parameters['controller'].humanize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
+  <% end %>
 </h1>
 <pre><%=h @exception.clean_message %></pre>
 
-- 
cgit v1.2.3