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
/
_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 8d78520cf56b52d1f653cee6dddd2e4ae8e7da9f..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(@object) 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 %>