Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix admin validation being too strict about usernames (#10449)

Browse source 
* Fix admin validation being too strict about usernames

Fix #10446

* Strip Setting.site_contact_username consistently throughout the codebase
This commit is contained in:
Eugen Rochko 2019-04-06 17:53:17 +02:00 • committed by GitHub
parent 78a8a99b0b
commit 2c63e0292a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/home_controller.rb
View file

@ -50,7 +50,7 @@ class HomeController < ApplicationController
push_subscription: current_account.user.web_push_subscription(current_session),
current_account: current_account,
token: current_session.token,
admin: Account.find_local(Setting.site_contact_username),
admin: Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')),
}
end

2
app/controllers/shares_controller.rb
View file

@ -21,7 +21,7 @@ class SharesController < ApplicationController
push_subscription: current_account.user.web_push_subscription(current_session),
current_account: current_account,
token: current_session.token,
admin: Account.find_local(Setting.site_contact_username),
admin: Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')),
text: text,
}
end