From 58a6345ae8788ff42763b3cd410c5bdda78f7de9 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sun, 20 Oct 2013 19:19:52 +0200
Subject: [PATCH] Fixed e-mail address visibility

---
 config.ini                | 3 ++-
 src/Views/user-view.phtml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.ini b/config.ini
index 29f7a93b..ab0d3b57 100644
--- a/config.ini
+++ b/config.ini
@@ -73,7 +73,8 @@ featurePost=moderator
 
 listUsers=registered
 viewUser=registered
-viewUserEmail=admin
+viewUserEmail.all=admin
+viewUserEmail.own=registered
 changeUserPassword.own=registered
 changeUserPassword.all=admin
 changeUserEmail.own=registered
diff --git a/src/Views/user-view.phtml b/src/Views/user-view.phtml
index 0ea9b30c..141e3507 100644
--- a/src/Views/user-view.phtml
+++ b/src/Views/user-view.phtml
@@ -19,7 +19,7 @@
 			<span class="value" title="<?php echo $val = TextHelper::camelCaseToHumanCase(AccessRank::toString($this->context->transport->user->access_rank)) ?>"><?php echo $val ?></span>
 		</div>
 
-		<?php if (PrivilegesHelper::confirm(Privilege::ViewUserEmail)): ?>
+		<?php if (PrivilegesHelper::confirm(Privilege::ViewUserEmail, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->user))): ?>
 			<div class="key-value email">
 				<span class="key">E-mail:</span>
 				<span class="value" title="<?php echo $val = ($this->context->transport->user->email_unconfirmed ? '(unconfirmed) ' . $this->context->transport->user->email_unconfirmed : $this->context->transport->user->email_confirmed ?: 'none specified') ?>"><?php echo $val ?></span>