Merge from head

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

diff --git a/app/views/quickvote/_candidate_list.rhtml b/app/views/quickvote/_candidate_list.rhtml
index f4f1c0628c06d91139300d38a0338cbfa3b02611..ddb47e53fa7f6a49b707bcecdb530e5ef0dd1a54 100644 (file)
--- a/app/views/quickvote/_candidate_list.rhtml
+++ b/app/views/quickvote/_candidate_list.rhtml
@@ -1,18 +1,18 @@
 <% %>
 <!-- the list of candidates -->
-<% if @flash[:candlist] %>
+<% if flash[:candlist] %>
   <ul>
-  <% for cand in @flash[:candlist] %>
-    <li><%= cand.capitalize %></li>
+  <% for cand in flash[:candlist] %>
+    <li><%=h cand.capitalize %></li>
   <% end %>
   </ul>
 <% end %>
 
-<%= form_remote_tag :update => 'candlist',
+<% form_remote_tag(:update => 'candlist',
                     :url => { :action => 'add_candidate' },
-                   :complete => "Field.focus('ajax_newcandidate')" %>
+                   :complete => "Field.focus('ajax_newcandidate')") do %>
 <p>
   <%= text_field "ajax", "newcandidate", :size => 40 %>
   <%= submit_tag "Add(+)" %>
 </p>
-<%= end_form_tag %>
+<% end %>