github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 06:49:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: use 'request.remote_ip' instead of 'request.ip' for better consistency

Browse Source
This commit is contained in:
Régis Hanol 2015-04-02 16:24:27 +02:00
parent a799f6f8d9
commit 1ec73b5ba0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/users_controller.rb
View File

@ -605,17 +605,12 @@ class UsersController < ApplicationController
return false if is_api? return false if is_api?
params[:password_confirmation] != honeypot_value || params[:password_confirmation] != honeypot_value ||
params[:challenge] != challenge_value.try(:reverse) params[:challenge] != challenge_value.try(:reverse)
end end
def user_params def user_params
params.permit( params.permit(:name, :email, :password, :username, :active)
:name, .merge(ip_address: request.remote_ip, registration_ip_address: request.remote_ip)
:email,
:password,
:username,
:active
).merge(ip_address: request.ip, registration_ip_address: request.ip)
end end
def fail_with(key) def fail_with(key)