Improved visibility of user profile details

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 06896a6af14e04377fdf266766ade044e65f3895..9ef82754fd1308e3bdae1f99a0f957a56da6cfd9 100644 (file)
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -171,9 +171,11 @@
                        
                        <div class="contentHeaderDescription">
                                <ul class="inlineList commaSeparated">
-                                       {if $user->isVisibleOption('gender') && $user->gender}<li>{lang}wcf.user.gender.{if $user->gender == 1}male{else}female{/if}{/lang}</li>{/if}
-                                       {if $user->isVisibleOption('birthday') && $user->getAge()}<li>{@$user->getAge()}</li>{/if}
-                                       {if $user->isVisibleOption('location') && $user->location}<li>{lang}wcf.user.membersList.location{/lang}</li>{/if}
+                                       {if !$user->isProtected()}
+                                               {if $user->isVisibleOption('gender') && $user->gender}<li>{lang}wcf.user.gender.{if $user->gender == 1}male{else}female{/if}{/lang}</li>{/if}
+                                               {if $user->isVisibleOption('birthday') && $user->getAge()}<li>{@$user->getAge()}</li>{/if}
+                                               {if $user->isVisibleOption('location') && $user->location}<li>{lang}wcf.user.membersList.location{/lang}</li>{/if}
+                                       {/if}
                                        {if $user->getOldUsername()}<li>{lang}wcf.user.profile.oldUsername{/lang}</li>{/if}
                                        <li>{lang}wcf.user.membersList.registrationDate{/lang}</li>
                                        {event name='userDataRow1'}

diff --git a/com.woltlab.wcf/templates/userInformationHeadline.tpl b/com.woltlab.wcf/templates/userInformationHeadline.tpl
index 4bc231e6ce02c36633b8072bb9e4d3bebdded536..caf3d3ed1e7840a2acbcf833c94a3cdaebd6a04f 100644 (file)
--- a/com.woltlab.wcf/templates/userInformationHeadline.tpl
+++ b/com.woltlab.wcf/templates/userInformationHeadline.tpl
@@ -11,7 +11,7 @@
        </h3>
 </div>
 <ul class="inlineList commaSeparated">
-       {if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && $user->isAccessible('canViewProfile')}
+       {if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}
                {if $user->isVisibleOption('gender') && $user->gender}<li>{lang}wcf.user.gender.{if $user->gender == 1}male{else}female{/if}{/lang}</li>{/if}
                {if $user->isVisibleOption('birthday') && $user->getAge()}<li>{@$user->getAge()}</li>{/if}
                {if $user->isVisibleOption('location') && $user->location}<li>{lang}wcf.user.membersList.location{/lang}</li>{/if}

diff --git a/com.woltlab.wcf/templates/userInformationStatistics.tpl b/com.woltlab.wcf/templates/userInformationStatistics.tpl
index fcf5fc73306e45881c8794993655fc7ec628900a..624ccb57f688c14add760fd323fbe3c336e97cd9 100644 (file)
--- a/com.woltlab.wcf/templates/userInformationStatistics.tpl
+++ b/com.woltlab.wcf/templates/userInformationStatistics.tpl
@@ -1,7 +1,7 @@
 {event name='statistics'}
 
 {if MODULE_LIKE && $user->likesReceived}
-       <dt>{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && $user->isAccessible('canViewProfile')}<a href="{link controller='User' object=$user}{/link}#likes" class="jsTooltip" title="{lang}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.likesReceived{/lang}</a>{else}{lang}wcf.like.likesReceived{/lang}{/if}</dt>
+       <dt>{if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && !$user->isProtected()}<a href="{link controller='User' object=$user}{/link}#likes" class="jsTooltip" title="{lang}wcf.like.showLikesReceived{/lang}">{lang}wcf.like.likesReceived{/lang}</a>{else}{lang}wcf.like.likesReceived{/lang}{/if}</dt>
        <dd>{#$user->likesReceived}</dd>
 {/if}