From ccd19021ae9cb59e6a45c760669d84138279dc59 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 19 Sep 2015 13:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E5=8F=98=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb         | 2 +-
 public/javascripts/init_activity_KindEditor.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index aae33e52a..f9b5b7d32 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -162,7 +162,7 @@ class MessagesController < ApplicationController
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
-    user_activity.updated_at = @reply.created_on
+    user_activity.updated_at = Time.now
     user_activity.save
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 866d0ea41..1e51067ef 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -151,4 +151,6 @@ function init_activity_KindEditor_data(id){
             }
         });
     });
+
+    $(".ke-edit").css("height","25px");
 }
\ No newline at end of file