projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
_activity.atom.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index 78350f2aa194c8ca311a6db733155a55027871d4..6688830baa954d081ac736703fe870e514535259 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@
-12,7
+12,7
@@
<link href="<%= activity_context(@activity) %>" rel="ostatus:conversation"/>
<%= if @data["summary"] do %>
<link href="<%= activity_context(@activity) %>" rel="ostatus:conversation"/>
<%= if @data["summary"] do %>
- <summary><%=
@data["summary"]
%></summary>
+ <summary><%=
escape(@data["summary"])
%></summary>
<% end %>
<%= if @activity.local do %>
<% end %>
<%= if @activity.local do %>
@@
-22,7
+22,7
@@
<link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
<% end %>
<link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
<% end %>
- <%= for tag <-
@data["tag"] || []
do %>
+ <%= for tag <-
Pleroma.Object.hashtags(@object)
do %>
<category term="<%= tag %>"></category>
<% end %>
<category term="<%= tag %>"></category>
<% end %>