Merge branch 'master' into openid
[rails.git] / app / controllers / user_controller.rb
index cc4ae4c..17f52fd 100644 (file)
@@ -231,7 +231,7 @@ class UserController < ApplicationController
       else
         password_authentication(params[:username], params[:password])
       end
-    else
+    elsif flash[:notice].nil?
       flash.now[:notice] =  t 'user.login.notice'
     end
   end