X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e4cb614e59057e6ea6d805eee1e4b258fb4e6dcf..058217bc69fe722fa4da9aaa49c5043c84dc9363:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 60e35016a..00dbcafb6 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -36,13 +36,13 @@ class UserController < ApplicationController return end else - @user = User.new(params[:user]) + @user = User.new(params[:user]) - @user.visible = true - @user.data_public = true - @user.description = "" if @user.description.nil? - @user.creation_ip = request.remote_ip - @user.languages = request.user_preferred_languages + @user.visible = true + @user.data_public = true + @user.description = "" if @user.description.nil? + @user.creation_ip = request.remote_ip + @user.languages = request.user_preferred_languages #Set the openid_url to nil as for one it is used #to check if the openid could be validated and secondly #to not get dupplicate conflicts for an empty openid @@ -133,6 +133,8 @@ class UserController < ApplicationController @user.home_lat = params[:user][:home_lat] @user.home_lon = params[:user][:home_lon] + @user.openid_url = nil if (params[:user][:openid_url].length == 0) + if @user.save set_locale