From 4a5e350615122752ad98c7c2fa9314daa5b2c72e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Nov 2016 17:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=9A?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E5=8D=B4=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E7=95=99=E8=A8=80=E9=A1=B5=E9=9D=A2=E5=8E=BB=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=90=88=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index de232a423..e4b480e2f 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -102,7 +102,11 @@ class WordsController < ApplicationController
         @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
         @activity = JournalsForMessage.where("id = #{params[:activity_id].to_i}").first if params[:activity_id]
         unless @activity
-          redirect_to feedback_path(@user)
+          if params[:user_activity_id] == params[:activity_id]
+            redirect_to feedback_path(@user)
+          else
+            redirect_to user_path(@user)
+          end
           return
         end
       elsif @journal_destroyed.jour_type == 'HomeworkCommon'