codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broken signup with Twitter

Browse source
This commit is contained in:
Neil Lalonde 2013-02-12 20:50:21 -05:00
parent 27a07054d7
commit 4e9d9138d6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/users_controller.rb
View file

@ -141,9 +141,8 @@ class UsersController < ApplicationController
auth = session[:authentication] auth = session[:authentication]
if auth && auth[:email] == params[:email] && auth[:email_valid] if auth && auth[:email] == params[:email] && auth[:email_valid]
user.active = true user.active = true
else
user.password_required
end end
user.password_required unless auth
Mothership.register_nickname( user.username, user.email ) if user.valid? and SiteSetting.call_mothership? Mothership.register_nickname( user.username, user.email ) if user.valid? and SiteSetting.call_mothership?