From aeb694a68e3191012f154fc351c87fa62da24e22 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Fri, 25 Mar 2016 13:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=88=A0=E9=99=A4bl?=
 =?UTF-8?q?og=5Fcomment=E6=97=B6=E5=88=A0=E9=99=A4user=5Factivities?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=80=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/blog_comments_controller.rb | 8 ++++----
 app/views/users/_user_activities.html.erb   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb
index 7220eec27..0224a587d 100644
--- a/app/controllers/blog_comments_controller.rb
+++ b/app/controllers/blog_comments_controller.rb
@@ -71,18 +71,18 @@ class BlogCommentsController < ApplicationController
         @course.save
         redirect_to course_path(:id=>params[:course_id])
       else
-        @article.children.delete
-        @article.delete
+        @article.children.destroy
+        @article.destroy
         redirect_to user_blogs_path(:user_id=>User.current)
       end
 
     else#如果是回复被删，
       if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的
-        @article.delete
+        @article.destroy
         redirect_to syllabus_course_path(:id=>params[:course_id])
       else
         root = @article.root
-        @article.delete
+        @article.destroy
         redirect_to user_blog_blog_comment_path(:user_id=>root.author_id,:blog_id=>root.blog_id,:id=>root.id)
       end
 
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 5061acbc1..6e590d293 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -56,7 +56,7 @@
         </script>
         <% unless user_activity.act_type == "ProjectCreateInfo" %>
         <% act= user_activity.act  %>
-        <% cache (user_activity) do %>
+        <% cache (act) do %>
         <% case user_activity.container_type.to_s %>
         <% when 'Course' %>
             <% if act  %>