merged more fixes from devel

[selectricity] / app / views / quickvote / thanks.rhtml

diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml
index bf98ef89ec1619e37b075dcece0ff6d29dbc5976..58454485a2aa53eb22a13a208e59abba2b55c4b0 100644 (file)
--- a/app/views/quickvote/thanks.rhtml
+++ b/app/views/quickvote/thanks.rhtml
@@ -8,11 +8,11 @@ preferences:</p>
 
 <ol>
   <% for rank in @voter.vote.rankings.sort %>
-    <li><%=h rank.candidate.name.capitalize %> </li>
+    <li><%= white_list(rank.candidate.name.capitalize) %> </li>
   <% end %>
 </ol>
 
-<p>Thanks you voting! You can:</p>
+<p>Thank you for voting! You can:</p>
 
 <ul>
   <li><%= link_to "Change Your Vote", quickaction_url( :ident => @voter.election.name, :action => 'change' ) %></li>