diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 17:02:16 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 17:02:16 +0100 |
| commit | 9d55529318a285ced484b9216df9064914d6f790 (patch) | |
| tree | 5e6ac6135236c44e5a75105c7af64652a27adce4 /app/views/stream_entries | |
| parent | bf08d46e58c423688d870cf128ded7fd36009115 (diff) | |
Fix text color in dashboard inputs, sanitize remote status content in UI,
simplify FanOutOnWriteService, add /api/accounts/lookup method
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 72d99af6f..11a9ac8e0 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -33,8 +33,7 @@ .counter-btn{ class: favourited_by_me_class(status) } %i.fa.fa-star %span.counter-number= status.reblog? ? status.reblog.favourites_count : status.favourites_count - .content - = status.reblog? ? (status.reblog.local? ? linkify(status.reblog) : status.reblog.content.html_safe) : (status.local? ? linkify(status) : status.content.html_safe) + .content= content_for_status(status.reblog? ? status.reblog : status) - if include_threads - status.descendants.with_includes.with_counters.each do |status| |