diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
| commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
| tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /app/helpers/stream_entries_helper.rb | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) | |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/stream_entries_helper.rb')
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index a91a28935..05cea73d7 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -67,7 +67,7 @@ module StreamEntriesHelper end def acct(account) - if embedded_view? && account.local? + if account.local? "@#{account.acct}@#{Rails.configuration.x.local_domain}" else "@#{account.acct}" |