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

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

diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index e098a8acc49a989a58b390e1cfb3a27570e23d95..dcf0d8b64e2682364b7c5b489ad1c9c72662bd19 100644 (file)
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -26,7 +26,7 @@ class PreferencesController < ApplicationController
       flash[:notice] = { :partial => "preferences/update_success_flash" }
       redirect_to preferences_path
     else
-      flash[:error] = t ".failure"
+      flash.now[:error] = t ".failure"
       render :edit
     end
   end