From e9124c62ceb6d779b8f78cf9e11de46eb6bc3098 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Oct 2014 09:22:41 +0800
Subject: [PATCH] =?UTF-8?q?#1250=E4=BF=AE=E6=94=B9=E5=B8=90=E5=8F=B7?=
 =?UTF-8?q?=E5=90=8E=E5=B0=86=E5=B8=90=E5=8F=B7=E6=9B=B4=E6=96=B0=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=94=BE=E5=9C=A8=E4=B8=80=E4=B8=AA=E6=98=BE=E7=9C=BC?=
 =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb      | 2 +-
 app/views/layouts/base_users.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 4e23fc41b..00c843045 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -130,7 +130,7 @@ class MyController < ApplicationController
         @user.pref.save
         @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
         set_language_if_valid @user.language
-        flash.now[:notice] = l(:notice_account_updated)
+        flash[:notice] = l(:notice_account_updated)
         redirect_to user_url(@user)
         return
       else
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index c1c0eaf7b..97d5fc47f 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -281,7 +281,7 @@
 							<%= yield %>
 							<%= call_hook :view_layouts_base_content %>
 							<div style="clear:both;"></div>
-							<%= render_flash_messages %>
+							<%#= render_flash_messages %>
 
 						</div>