From b0897638d97cf80345e4815433dcee2509ad9b46 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 7 Mar 2015 17:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/poll_result.html.erb | 4 +---
 app/views/poll/show.html.erb        | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/poll/poll_result.html.erb b/app/views/poll/poll_result.html.erb
index a7cb415b3..47f3b179d 100644
--- a/app/views/poll/poll_result.html.erb
+++ b/app/views/poll/poll_result.html.erb
@@ -4,9 +4,7 @@
     <h1 class="ur_page_title">
       <%= @poll.polls_name.empty? ? l(:label_poll_new) : @poll.polls_name %>
     </h1>
-    <p class="ur_prefix_content">
-      <%= @poll.polls_description%>
-    </p>
+    <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
   </div>
   <div class="ur_card">
     <ol class="ur_questions">
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index ae2691a91..ad10a5468 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -33,9 +33,7 @@
     <h1 class="ur_page_title">
       <%= @poll.polls_name%>
     </h1>
-    <p class="ur_prefix_content">
-      <%= @poll.polls_description.html_safe %>
-    </p>
+    <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
   </div>