From: Marcel Werk Date: Wed, 11 Jun 2014 22:38:22 +0000 (+0200) Subject: Merge branch '2.0' X-Git-Tag: 2.1.0_Alpha_1~709 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=45cc91d6d548f4827bcecfb351f956872530b9e2;p=GitHub%2FWoltLab%2FWCF.git Merge branch '2.0' Conflicts: com.woltlab.wcf/templates/user.tpl --- 45cc91d6d548f4827bcecfb351f956872530b9e2 diff --cc com.woltlab.wcf/templates/user.tpl index 32e75d42f3,8f177e5d28..d7cf39a496 --- a/com.woltlab.wcf/templates/user.tpl +++ b/com.woltlab.wcf/templates/user.tpl @@@ -179,24 -135,8 +179,28 @@@ {/hascontent} - {if $user->userID != $__wcf->user->userID}{if $user->isAccessible('canViewEmailAddress') || $__wcf->session->getPermission('admin.general.canViewPrivateUserOptions')}
    • {elseif $user->isAccessible('canMail') && $__wcf->session->getPermission('user.profile.canMail')}
    • {/if}{/if} + + {if $__wcf->session->getPermission('user.profile.canReportContent')} +
    • + {/if} + - {if $user->userID != $__wcf->user->userID && $user->isAccessible('canViewEmailAddress')} -
    • {elseif $user->isAccessible('canMail') && $__wcf->session->getPermission('user.profile.canMail')}
    • ++ {if $user->userID != $__wcf->user->userID} ++ {if $user->isAccessible('canViewEmailAddress') || $__wcf->session->getPermission('admin.general.canViewPrivateUserOptions')} ++
    • ++ {elseif $user->isAccessible('canMail') && $__wcf->session->getPermission('user.profile.canMail')} ++
    • ++ {/if} + {/if} + {event name='buttons'} + + {if $isAccessible && $__wcf->user->userID != $user->userID && ($__wcf->session->getPermission('admin.user.canBanUser') || $__wcf->session->getPermission('admin.user.canDisableAvatar') || $__wcf->session->getPermission('admin.user.canDisableSignature') || ($__wcf->session->getPermission('admin.general.canUseAcp') && $__wcf->session->getPermission('admin.user.canEditUser')))} +
  • + {* todo: better icon? *} + + +
    • + {/if}