diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-06 17:53:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 17:53:17 +0200 |
| commit | 2c63e0292a0a0a530ce814246bb6762983808135 (patch) | |
| tree | 69814a662f68695490884667ea5bcd51feedc8d8 /app/controllers | |
| parent | 78a8a99b0bcfb02d04ee5a4c48b116f6ed7d96b7 (diff) | |
Fix admin validation being too strict about usernames (#10449)
* Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/home_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/shares_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index b5d6460f9..d1bd0601e 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -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 diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb index 9ef1e0749..af605b98f 100644 --- a/app/controllers/shares_controller.rb +++ b/app/controllers/shares_controller.rb @@ -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 |