From 708e26d97a11ba4f3a2085d8275d2ba697e7d3bc Mon Sep 17 00:00:00 2001 From: oudoken Date: Thu, 21 Jun 2018 09:27:43 +0200 Subject: [PATCH] Issue #3150 The current user can view his email on user profile page --- .../shortcodes/batch/user_shortcodes.php | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index 22b6f27d6..20db7bdb2 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -265,24 +265,30 @@ class user_shortcodes extends e_shortcode - function sc_user_email($parm='') +function sc_user_email($parm='') +{ + + $tp = e107::getParser(); + + $aCurUserData = e107::user(USERID); + + if( ($this->var['user_hideemail'] && !ADMIN ) && ( $this->var['user_email']!=$aCurUserData['user_email'] ) ) { - - $tp = e107::getParser(); - - if($this->var['user_hideemail'] && !ADMIN) - { - return "".LAN_USER_35.""; - } - else - { + return "".LAN_USER_35.""; + } + else + { + if($this->var['user_email']!=$aCurUserData['user_email']){ return $tp->emailObfuscate($this->var['user_email']); //list($user,$dom) = explode('@', $this->var['user_email']); //return "@"; + }else{ + return $this->var['user_email']; } - } +} + /** * USER_ICON Shortcode