Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

app/api/mobile/entities/activity.rb

@@ -41,11 +41,11 @@ module Mobile
                   end
                 when :description
                   if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News"
-                    ac.act.description unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.description) unless ac.nil? || ac.act.nil?
                   elsif ac.act_type == "Message" || ac.act_type == "BlogComment"
-                    ac.act.content unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.content) unless ac.nil? || ac.act.nil?
                   elsif ac.act_type == "JournalsForMessage"
-                    ac.act.notes unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.notes) unless ac.nil? || ac.act.nil?
                   end
                 when :latest_update
                   time_from_now ac.updated_at unless ac.nil?