From f51e402c1419f069d464a06a1628b2a5f03259b3 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 23 Jan 2017 16:23:02 +0100
Subject: [PATCH] Improved visibility of user profile details

---
 com.woltlab.wcf/templates/user.tpl                      | 8 +++++---
 com.woltlab.wcf/templates/userInformationHeadline.tpl   | 2 +-
 com.woltlab.wcf/templates/userInformationStatistics.tpl | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 06896a6af1..9ef82754fd 100644
--- 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 4bc231e6ce..caf3d3ed1e 100644
--- 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 fcf5fc7330..624ccb57f6 100644
--- 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}
 
-- 
2.20.1