From: Tom Hughes <tom@compton.nu>
Date: Sun, 24 Feb 2008 13:43:42 +0000 (+0000)
Subject: Fix stupid breakage. Closes #708.
X-Git-Tag: live~7861
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1c6a83f0e83f7a97301edbe902ef8f5e501e3d0f?ds=sidebyside

Fix stupid breakage. Closes #708.
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index c399066ca..bd0c143c0 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -116,7 +116,7 @@ class UserController < ApplicationController
           redirect_to :controller => 'site', :action => 'index'
         end
         return
-      elsif User.authenticate(:username => email_or_display_name, :password => pass, :invalid => true)
+      elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
         flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
       else
         flash[:notice] = "Sorry, couldn't log in with those details."