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 'pleroma/develop' into cycles-plugs
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
_tag_activity.atom.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index 098e2820558515bdd6248260bb8a10db517f8ea0..c2de28fe48888bea7d8f3fc8c71d6a576cc5a89b 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@
-41,8
+41,8
@@
<% end %>
<% end %>
<% end %>
<% end %>
- <%= for
hashtag <- Object.hashtags(@data
) do %>
- <category term="<%=
hash
tag %>"></category>
+ <%= for
tag <- Pleroma.Object.hashtags(@object
) do %>
+ <category term="<%= tag %>"></category>
<% end %>
<%= for {emoji, file} <- @data["emoji"] || %{} do %>
<% end %>
<%= for {emoji, file} <- @data["emoji"] || %{} do %>