From 7f08652cd14ba8df228a5cddc3d14056802aa590 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 9 Oct 2014 17:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=20#1250=20=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=EF=BC=9Aflash=E6=98=BE=E7=A4=BA=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=90=8E=E8=87=AA=E5=8A=A8=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 1e58c53f1..ccdf80464 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[:notice] = l(:notice_account_updated)
+        flash.now[:notice] = l(:notice_account_updated)
         redirect_to user_path(@user)
         return
       else
@@ -160,7 +160,7 @@ class MyController < ApplicationController
       @user.destroy
       if @user.destroyed?
         logout_user
-        flash[:notice] = l(:notice_account_deleted)
+        flash.now[:notice] = l(:notice_account_deleted)
       end
       redirect_to home_path
     end
@@ -170,7 +170,7 @@ class MyController < ApplicationController
   def password
     @user = User.current
     unless @user.change_password_allowed?
-      flash[:error] = l(:notice_can_t_change_password)
+      flash.now[:error] = l(:notice_can_t_change_password)
       redirect_to my_account_path
       return
     end