Merge branch 'master' into microblog-comments-fix

This commit is contained in:
Alexander Minkin 2023-08-11 17:16:24 +03:00 committed by GitHub
commit 2faab04d9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View file

@ -226,6 +226,7 @@
{strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]} {strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]}
</a> </a>
<div id="_groupListPinnedGroups"> <div id="_groupListPinnedGroups">
<div id="_groupListPinnedGroups"> <div id="_groupListPinnedGroups">
<div n:if="$thisUser->getPinnedClubCount() > 0" class="menu_divider"></div> <div n:if="$thisUser->getPinnedClubCount() > 0" class="menu_divider"></div>
<a n:foreach="$thisUser->getPinnedClubs() as $club" href="{$club->getURL()}" class="link group_link">{$club->getName()}</a> <a n:foreach="$thisUser->getPinnedClubs() as $club" href="{$club->getURL()}" class="link group_link">{$club->getName()}</a>

View file

@ -61,7 +61,9 @@
{php $target = "topic"} {php $target = "topic"}
{/if} {/if}
<span n:if="$compact ?? false"> <span n:if="$compact ?? false">
|&nbsp;<a |&nbsp;<a
{if is_null($linkW)} {if is_null($linkW)}
href="#_comment{$comment->getId()}" href="#_comment{$comment->getId()}"
@ -70,6 +72,7 @@
{/if} {/if}
class="date" class="date"
>{$comment->getPublicationTime()}</a> >{$comment->getPublicationTime()}</a>
</span> </span>
</div> </div>
</div> </div>