Merge remote branch 'remotes/deployment/master' into live

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

diff --git a/app/views/quickvote/my_quickvotes.rhtml b/app/views/quickvote/my_quickvotes.rhtml
index a920480be21a2515272ecf398f91190fd19f10bb..bb388366be9d140706efc30c657054a3779c5355 100644 (file)
--- a/app/views/quickvote/my_quickvotes.rhtml
+++ b/app/views/quickvote/my_quickvotes.rhtml
@@ -13,12 +13,12 @@
                     quickaction_url( :ident => quickvote.name, 
                                      :action => 'results' ) %>
                <% else %>
-                 <%= quickvote.name %>
+                 <%=h quickvote.name %>
                <% end %>
        </td>
-    <td><%= quickvote.startdate.strftime("%x") %></td>
-    <td><%= quickvote.enddate.strftime("%x") %></td>
-       <td><%= quickvote.description %></td>
+    <td><%=h quickvote.startdate.strftime("%x") %></td>
+    <td><%=h quickvote.enddate.strftime("%x") %></td>
+       <td><%=h quickvote.description %></td>
   </tr>
 <% end %>
 </table>