From c25fbb77fa8ec9a831293484934128c484a57f71 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 23 Dec 2015 16:20:06 -0500 Subject: [PATCH] Avoid show the invisible user extra fields on My Profile page - refs BT#10631 --- main/inc/lib/api.lib.php | 8 +++++--- main/inc/lib/social.lib.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index fcf52f7d0d..3bebe64e3e 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -1507,7 +1507,7 @@ function _api_format_user($user, $add_password = false) * @param bool $checkIfUserOnline * @param bool $showPassword * @param bool $loadExtraData - * + * @param bool $loadOnlyVisibleExtraData Get the user extra fields that are visible * @return array $user_info user_id, lastname, firstname, username, email, etc * @author Patrick Cool * @author Julio Montoya @@ -1517,7 +1517,8 @@ function api_get_user_info( $user_id = 0, $checkIfUserOnline = false, $showPassword = false, - $loadExtraData = false + $loadExtraData = false, + $loadOnlyVisibleExtraData = false ) { if (empty($user_id)) { $userFromSession = Session::read('_user'); @@ -1557,7 +1558,8 @@ function api_get_user_info( $fieldValue = new ExtraFieldValue('user'); $result_array['extra'] = $fieldValue->getAllValuesForAnItem( - $user_id + $user_id, + $loadOnlyVisibleExtraData ); } $user = _api_format_user($result_array, $showPassword); diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 03962c8f41..2268bc4d50 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -1672,7 +1672,7 @@ class SocialManager extends UserManager $vCardUserLink = Display::getVCardUserLink($userId); - $userInfo = api_get_user_info($userId, true, false, true); + $userInfo = api_get_user_info($userId, true, false, true, true); $template->assign('user', $userInfo); $template->assign('social_avatar_block', $socialAvatarBlock);