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

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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 14648dc9c37eea68d78bb9b255ede055cbca15c1..075b5a8649493bc216ba3b84faa6e56df0af015c 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -116,7 +116,7 @@ class TracesController < ApplicationController
         @trace.schedule_import
         redirect_to :action => :index, :display_name => current_user.display_name
       else
         @trace.schedule_import
         redirect_to :action => :index, :display_name => current_user.display_name
       else

-        flash[:error] = t(".upload_failed") if @trace.valid?
+        flash.now[:error] = t(".upload_failed") if @trace.valid?

 
         render :action => "new"
       end
 
         render :action => "new"
       end