From 61b759b7395233bd9394aaeb4901cfa47b5fd869 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 18 Jul 2015 10:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb | 2 +-
 app/views/users/show.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 84e2e7d35..a89ae846e 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -200,7 +200,7 @@ class MyController < ApplicationController
         flash.now[:error] = l(:notice_account_wrong_password)
       end
     end
-    render :template => 'my/account',:layout=>'base_users_new'
+    #render :template => 'my/account',:layout=>'base_users_new'
   rescue Exception => e
     if e.message == 'wrong password'
       flash.now[:error] = l(:notice_account_wrong_password)
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3bf7d8118..003555158 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -36,7 +36,7 @@
         <p nhname='contentmsg'></p>
         <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
         <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
-        <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">发布</a>
+        <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">留言</a>
       </form>
     </div>
     <div class="cl"></div>