3 files changed, 4 insertions, 6 deletions
diff --git a/app/views/general/blog.html.erb b/app/views/general/blog.html.erb
index 5dda7ab74..fd87bd9fe 100644
--- a/app/views/general/blog.html.erb
+++ b/app/views/general/blog.html.erb
@@ -10,9 +10,9 @@
           <p class="subtitle"><%= _("Posted on {{date}} by {{author}}", :date=>simple_date(Time.parse(item['pubDate'][0])), :author=> item['creator'] ? item['creator'][0] : item['author'][0]) %></p>
           <div>
             <% if item['encoded'] %>
-              <%= raw item['encoded'][0] %>
+              <%= sanitize(raw item['encoded'][0]) %>
             <% elsif item['description'] %>
-              <%= raw item['description'][0] %>
+              <%= sanitize(raw item['description'][0]) %>
             <% end %>
           </div>
           <p><em>
diff --git a/app/views/general/exception_caught.html.erb b/app/views/general/exception_caught.html.erb
index 8d78e2e92..21223dc1e 100644
--- a/app/views/general/exception_caught.html.erb
+++ b/app/views/general/exception_caught.html.erb
@@ -12,13 +12,10 @@
              <%= submit_tag _("Search") %>
       <% end %>
   </li>
-  </ul>  
+  </ul>
  <% else %>
   <h1><%= _("Sorry, there was a problem processing this page") %></h1>
   <p><%= _('You have found a bug.  Please <a href="{{contact_url}}">contact us</a> to tell us about the problem', :contact_url => help_contact_path) %></p>
 
  <% end %>
-  <h2><%= _('Technical details') %></h2>
-  <p><strong><%= h(@exception_class ? @exception_class : _("Unknown")) %></strong></p>
-  <p><strong><%= h(@exception_message) %></strong></p>
 </div>
diff --git a/app/views/general/search.html.erb b/app/views/general/search.html.erb
index 3914a2f30..96c91b791 100644
--- a/app/views/general/search.html.erb
+++ b/app/views/general/search.html.erb
@@ -131,6 +131,7 @@
   <div id="header_right">
     <h2><%= _('Track this search')%></h2>
     <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %>
+    <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'main' } %>
   </div>
 <% end %>