From 9487ce1245894efa0a9a45314c4ec6de7f93ebd1 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 11:02:09 +0800
Subject: [PATCH] =?UTF-8?q?#1807=E8=AF=BE=E7=A8=8B--=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=EF=BC=9A=E7=AD=94=E9=A2=98=E5=A4=9A=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BB=E8=A7=82=E5=90=8E=EF=BC=8C=E5=86=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E7=AD=94=E9=A2=98=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E5=9B=BE=EF=BC=8C=E6=98=BE=E7=A4=BAhtml=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0<br>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index c1ac5d377..bc5136718 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -180,7 +180,7 @@
 
                       }
                   </script>
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id) %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
@@ -222,7 +222,7 @@
                             });
                         }
                     </script>
-                    <div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id) %></div>
+                    <div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id).html_safe %></div>
                   </div>
                 </div>
               </li><!--多行输入 end-->