Merge remote-tracking branch 'upstream/pull/5405'

[rails.git] / app / controllers / profiles_controller.rb

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index b48d08ad2ebece1d3fb14ed1ffaa18fbe6d18968..4005176ce192c529d8f4f535e57ada04569f1622 100644 (file)
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -36,7 +36,7 @@ class ProfilesController < ApplicationController
       flash[:notice] = t ".success"
       redirect_to user_path(current_user)
     else
       flash[:notice] = t ".success"
       redirect_to user_path(current_user)
     else

-      flash[:error] = t ".failure"
+      flash.now[:error] = t ".failure"

       render :edit
     end
   end
       render :edit
     end
   end