Fix broken signup with Twitter
This commit is contained in:
parent
27a07054d7
commit
4e9d9138d6
|
@ -141,9 +141,8 @@ class UsersController < ApplicationController
|
|||
auth = session[:authentication]
|
||||
if auth && auth[:email] == params[:email] && auth[:email_valid]
|
||||
user.active = true
|
||||
else
|
||||
user.password_required
|
||||
end
|
||||
user.password_required unless auth
|
||||
|
||||
Mothership.register_nickname( user.username, user.email ) if user.valid? and SiteSetting.call_mothership?
|
||||
|
||||
|
|
Loading…
Reference in New Issue