From: Tom Hughes <tom@compton.nu>
Date: Fri, 10 Sep 2010 10:23:01 +0000 (+0100)
Subject: Only display the license notice if we don't already have a notice
X-Git-Tag: live~6878^2~9
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ef038fa5fe7309888545bab66758cd1f8fbd51bd

Only display the license notice if we don't already have a notice
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index b9cca0cf6..21561736c 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -220,7 +220,7 @@ class UserController < ApplicationController
       else
         flash.now[:error] = t 'user.login.auth failure'
       end
-    else
+    elsif flash[:notice].nil?
       flash.now[:notice] =  t 'user.login.notice'
     end
   end