github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:14:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: wasn't able to update user options anymore

Browse Source
This commit is contained in:
Régis Hanol
2017-09-26 20:00:10 +02:00
parent 460ed3c8cf
commit 28c54b42c5
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/users_controller.rb
View File

@ -849,7 +849,7 @@ class UsersController < ApplicationController
end
def user_params
result = params.permit(
permitted = [
:name,
:email,
:password,
@ -858,11 +858,15 @@ class UsersController < ApplicationController
:muted_usernames,
:theme_key,
:locale
).reverse_merge(
ip_address: request.remote_ip,
registration_ip_address: request.remote_ip,
locale: user_locale
)
] + UserUpdater::OPTION_ATTR
result = params
.permit(permitted)
.reverse_merge(
ip_address: request.remote_ip,
registration_ip_address: request.remote_ip,
locale: user_locale
)
if !UsernameCheckerService.is_developer?(result['email']) &&
is_api? &&