0
@@ -286,7 +286,7 @@
0
     # 5. Raise 406 if none found
0
     def _perform_content_negotiation # :nodoc:
0
       raise Merb::ControllerExceptions::NotAcceptable if _provided_formats.empty?
0
-      if (fmt = params[:format]) && !fmt.empty? && _provided_formats.include?(fmt.to_sym)
0
+      if (fmt = params[:format]) && !fmt.empty?
0
         return fmt.to_sym
0
       end
0
       accepts = Responder.parse(request.accept).map {|t| t.to_sym}

0
@@ -176,10 +176,14 @@
0
           <tr><th width="25%">Parameter</th><th width="75%">Value</th></tr>
0
         </thead>
0
         <tbody>                
0
+  			<% unless params[:original_params].blank? %>		      
0
           <% params[:original_params].each_with_index do |param_value, i| %>
0
             <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= param_value.first %></td><td><%= param_value.last.inspect %></td></tr>
0
           <% end %>
0
           <%= "<tr class='odd'><td colspan='2'>None</td></tr>" if params[:original_params].empty? %>      
0
+      	<% else %>
0
+      	  <tr><td colspan="2">None</td></tr>
0
+      	<% end %>    			
0
         </tbody>
0
       </table>
0
       
0
0
@@ -189,10 +193,14 @@
0
           <tr><th width="25%">Key</th><th width="75%">Value</th></tr>
0
         </thead>
0
         <tbody>                
0
+  			<% unless params[:original_session].blank? %>		      
0
           <% params[:original_session].each_with_index do |param_value, i| %>
0
             <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= param_value.first %></td><td><%= param_value.last.inspect %></td></tr>
0
           <% end %>
0
           <%= "<tr class='odd'><td colspan='2'>None</td></tr>" if params[:original_session].empty? %>
0
+      	<% else %>
0
+      	  <tr><td colspan="2">None</td></tr>
0
+      	<% end %>
0
         </tbody>
0
       </table>
0
       
0
0
0
0
0
@@ -202,27 +210,31 @@
0
           <tr><th width="25%">Cookie</th><th width="75%">Value</th></tr>
0
         </thead>
0
         <tbody>        
0
+  			<% unless params[:original_cookies].blank? %>		      
0
           <% params[:original_cookies].each_with_index do |param_value, i| %>
0
             <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= param_value.first %></td><td><%= param_value.last.inspect %></td></tr>
0
           <% end %>
0
           <%= "<tr class='odd'><td colspan='2'>None</td></tr>" if params[:original_cookies].empty? %>
0
+  			<% else %>
0
+  			  <tr><td colspan="2">None</td></tr>
0
+  			<% end %>
0
         </tbody>
0
       </table>
0
       
0
       <h3>Named Routes</h3>
0
       <table class="listing" style="display: none">
0
-			<% unless Merb::Router.named_routes.empty? %>
0
         <thead>
0
           <tr><th width="25%">Name</th><th width="75%">Route</th></tr>
0
         </thead>
0
         <tbody>
0
-			  <% Merb::Router.named_routes.each_with_index do |name_route, i| %>
0
-			    <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= name_route.first %></td><td><%= name_route.last %></td></tr>
0
-			  <% end %>			  
0
+  			<% unless Merb::Router.named_routes.empty? %>		      
0
+  			  <% Merb::Router.named_routes.each_with_index do |name_route, i| %>
0
+  			    <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= name_route.first %></td><td><%= name_route.last %></td></tr>
0
+  			  <% end %>
0
+  		  <% else %>
0
+    		  <tr><td colspan="2">None</td></tr>
0
+  		  <% end %>			  
0
         </tbody>
0
-		  <% else %>
0
-  		  <tr><td colspan="2">None</td></tr>
0
-		  <% end %>
0
       </table>      
0
     </div>
0