cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix stupid breakage. Closes #708.

Browse source
This commit is contained in:
Tom Hughes 2008-02-24 13:43:42 +00:00
parent bb510b8ff4
commit 1c6a83f0e8
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/user_controller.rb
View file

@ -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."