projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
static_fe
/
static_fe
/
profile.html.eex
diff --git
a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
index e7d2aecadf41e38502c6393d5b53e3f7f06f09b8..3191bf45045cb8359f58fb2425292343eebf1a05 100644
(file)
--- a/
lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
+++ b/
lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
@@
-7,7
+7,7
@@
<input type="hidden" name="profile" value="">
<button type="submit" class="collapse">Remote follow</button>
</form>
<input type="hidden" name="profile" value="">
<button type="submit" class="collapse">Remote follow</button>
</form>
- <%= raw Formatter.emojify(@user.name,
emoji_for_user(@user)
) %> |
+ <%= raw Formatter.emojify(@user.name,
@user.emoji
) %> |
<%= link "@#{@user.nickname}@#{Endpoint.host()}", to: (@user.uri || @user.ap_id) %>
</h3>
<p><%= raw @user.bio %></p>
<%= link "@#{@user.nickname}@#{Endpoint.host()}", to: (@user.uri || @user.ap_id) %>
</h3>
<p><%= raw @user.bio %></p>