Merge remote-tracking branch 'upstream/pull/4960'
This commit is contained in:
commit
2061b5c257
1 changed files with 25 additions and 27 deletions
|
@ -262,7 +262,6 @@ class UsersController < ApplicationController
|
||||||
private
|
private
|
||||||
|
|
||||||
def save_new_user(email_hmac, referer = nil)
|
def save_new_user(email_hmac, referer = nil)
|
||||||
if check_signup_allowed(current_user.email)
|
|
||||||
current_user.data_public = true
|
current_user.data_public = true
|
||||||
current_user.description = "" if current_user.description.nil?
|
current_user.description = "" if current_user.description.nil?
|
||||||
current_user.creation_ip = request.remote_ip
|
current_user.creation_ip = request.remote_ip
|
||||||
|
@ -297,7 +296,6 @@ class UsersController < ApplicationController
|
||||||
render :action => "new", :referer => params[:referer]
|
render :action => "new", :referer => params[:referer]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
def welcome_options(referer = nil)
|
def welcome_options(referer = nil)
|
||||||
uri = URI(referer) if referer.present?
|
uri = URI(referer) if referer.present?
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue