From d192a564b4072caf78df22cfe2c8761763c5fec3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 8 Apr 2015 14:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E3=80=81=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=8F=8F=E8=BF=B0=E5=87=BA=E7=8E=B0html=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/courses/show.html.erb | 2 +-
app/views/layouts/base_homework.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 698bf3cea..79cb267b4 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -16,7 +16,7 @@
<%= l(:label_new_activity) %>：
<%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:class => "problem_tit c_dblue fl fb"%>
- <%= e.event_description %>
+
<%= e.event_description.html_safe %>
<%= l :label_activity_time %> ： <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %>
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index bb7b18a4a..27a8e67f4 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -149,7 +149,7 @@