Merge head

[selectricity-live] / app / views / quickvote / _candidate_list.rhtml

diff --git a/app/views/quickvote/_candidate_list.rhtml b/app/views/quickvote/_candidate_list.rhtml
index 64aa97926c228cdb0813e0096965d4f005aec67d..76de0ac59e25c40512a466deb13a0af620ddbdd6 100644 (file)
--- a/app/views/quickvote/_candidate_list.rhtml
+++ b/app/views/quickvote/_candidate_list.rhtml
@@ -1,14 +1,14 @@
 <% %>
 <!-- the list of candidates -->
-<% if flash[:candlist] %>
+<% if flash[:candidate_names] %>
   <ul>
-  <% for cand in flash[:candlist] %>
-    <li><%= cand.capitalize %></li>
+  <% for cand in flash[:candidate_names] %>
+    <li><%=h cand.capitalize %></li>
   <% end %>
   </ul>
 <% end %>
 
-<% form_remote_tag(:update => 'candlist',
+<% form_remote_tag(:update => 'candidate_names',
                     :url => { :action => 'add_candidate' },
                    :complete => "Field.focus('ajax_newcandidate')") do %>
 <p>