From f87e335acf4f188da396bda1416745c5b45b0f59 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 14 Oct 2016 15:01:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index c9bb42ebe..de232a423 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -332,7 +332,7 @@ class WordsController < ApplicationController
       @homework_common = HomeworkCommon.find reply.jour_id
       if params[:reply_message].size>0 && User.current.logged? && @user
         options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i, :root_id => reply.root_id}
-        feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, options)
+        feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, reply.root_id, options)
         if (feedback.errors.empty?)
           if params[:asset_id]
             ids = params[:asset_id].split(',')
@@ -366,7 +366,7 @@ class WordsController < ApplicationController
       @syllabus = Syllabus.find reply.jour_id
       if params[:reply_message].size>0 && User.current.logged? && @user
         options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i, :root_id => reply.root_id}
-        feedback = Syllabus.add_syllabus_jour(@user, params[:reply_message], reply.jour_id, options)
+        feedback = Syllabus.add_syllabus_jour(@user, params[:reply_message], reply.jour_id, reply.root_id, options)
         if (feedback.errors.empty?)
           if params[:asset_id]
             ids = params[:asset_id].split(',')

From 5f04baf572c7577acbef27b597d2dff29d9d3738 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 14 Oct 2016 15:09:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=98=BE=E7=A4=BA=EF=BC=9A=E2=80=9C=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D=E3=80=81=E2=80=9C=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=E5=9B=9E=E5=A4=8D=E2=80=9D=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 150a113a3..de7ba7f68 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3559,7 +3559,7 @@ class UsersController < ApplicationController
           @type = 'Issue'
           @user_activity_id = params[:div_id].to_i if params[:div_id]
         when 'BlogComment'
-          #obj = BlogComment.where('id = ?', params[:id].to_i).first
+          obj = BlogComment.where('id = ?', params[:id].to_i).first
           @user_activity_id = params[:div_id].to_i if params[:div_id]
           @homepage = params[:homepage].to_i
           @type = 'BlogComment'