From: Matthias Schmidt Date: Tue, 19 Mar 2019 17:38:19 +0000 (+0100) Subject: Merge branch 'master' into next X-Git-Tag: 5.2.0_Alpha_1~203 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8a2f8e49d065d638142d49cddfd580a54798b313;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' into next --- 8a2f8e49d065d638142d49cddfd580a54798b313 diff --cc com.woltlab.wcf/templates/userInformationStatistics.tpl index 5594c83760,de7c476987..a5fd115378 --- a/com.woltlab.wcf/templates/userInformationStatistics.tpl +++ b/com.woltlab.wcf/templates/userInformationStatistics.tpl @@@ -1,11 -1,10 +1,13 @@@ + {if !$disableDialogLinks|isset}{assign var=disableDialogLinks value=false}{/if} + {event name='statistics'} -{if MODULE_LIKE && $user->likesReceived} -
{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}{lang}wcf.like.likesReceived{/lang}{else}{lang}wcf.like.likesReceived{/lang}{/if}
-
{#$user->likesReceived}
+{if MODULE_LIKE} + {assign var=reactionReputation value=$user->positiveReactionsReceived - $user->negativeReactionsReceived} + {if $reactionReputation} +
{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}{lang}wcf.like.reputation{/lang}{else}{lang}wcf.like.reputation{/lang}{/if}
+
{#$reactionReputation}
+ {/if} {/if} {if $user->activityPoints}