about summary refs log tree commit diff
path: root/app/views/stream_entries
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-05 23:42:40 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-05 23:42:40 +0100
commitab80ebdeecf9410c5b43dde333b2e036e1198e24 (patch)
tree5526ec2ad37df18bb07ff830e9fc18b22457f446 /app/views/stream_entries
parent6045b6cb1880b27e8b21799b9501a794a5f5b88b (diff)
Adjusting design of profile and entry pages, linkify mentions in statuses
Diffstat (limited to 'app/views/stream_entries')
-rw-r--r--app/views/stream_entries/_status.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index 89dd53613..a11da83a6 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -22,7 +22,7 @@
             = relative_time(status.reblog? ? status.reblog.created_at : status.created_at)
 
       .content
-        = status.content.html_safe
+        = status.reblog? ? (status.reblog.local? ? linkify(status.reblog) : status.reblog.content.html_safe) : (status.local? ? linkify(status) : status.content.html_safe)
 
 - if include_threads
   - status.replies.each do |status|