diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-02-06 21:36:38 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-06 21:36:38 +0100 |
commit | 1a54b9b99e85e9d6b3c52bfe654659019960eb24 (patch) | |
tree | 33fe0d6c546dade46cf7842959feff686db4f909 /app/helpers | |
parent | ccaefd139d33f2f0bf4d097131bcf91960bee956 (diff) | |
parent | aeb6efbb03cd98c0425d094677fc748e0c36c240 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/accounts_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index c9e95d8d8..e977db2c6 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -11,7 +11,7 @@ module AccountsHelper def acct(account) if account.local? - "@#{account.acct}@#{Rails.configuration.x.local_domain}" + "@#{account.acct}@#{site_hostname}" else "@#{account.pretty_acct}" end |