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

Fixed some failing tests caused by the openID changes

Browse source
This commit is contained in:
Kai Krueger 2010-01-23 14:23:35 +00:00
parent f0cac0fcc3
commit 45f12aa99e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/user_controller.rb
View file

@ -46,7 +46,7 @@ class UserController < ApplicationController
#to not get dupplicate conflicts for an empty openid #to not get dupplicate conflicts for an empty openid
@user.openid_url = nil @user.openid_url = nil
if (params[:user][:openid_url].length > 0) if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
if @user.pass_crypt.length == 0 if @user.pass_crypt.length == 0
#if the password is empty, but we have a openid #if the password is empty, but we have a openid
#then generate a random passowrd to disable #then generate a random passowrd to disable
@ -282,7 +282,7 @@ class UserController < ApplicationController
if params[:user] and session[:user].nil? if params[:user] and session[:user].nil?
if !params[:user][:openid_url].empty? if !params[:user][:openid_url].nil? and !params[:user][:openid_url].empty?
open_id_authentication(params[:user][:openid_url]) open_id_authentication(params[:user][:openid_url])
else else
email_or_display_name = params[:user][:email] email_or_display_name = params[:user][:email]