diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-28 17:55:30 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-28 17:55:30 +0200 |
| commit | 710a0b3ea3ef29f4f26681db2b11faab36dac2e0 (patch) | |
| tree | af8eaf57933c03fa3f67ba2c0446a37a32d3e9fb | |
| parent | 2df92309028953fce04b4a5f141575889576cb18 (diff) | |
| parent | b53f95e577c08ec1c1714334da8b9ecc60cd769a (diff) | |
| download | forums-710a0b3ea3ef29f4f26681db2b11faab36dac2e0.tar forums-710a0b3ea3ef29f4f26681db2b11faab36dac2e0.tar.gz forums-710a0b3ea3ef29f4f26681db2b11faab36dac2e0.tar.bz2 forums-710a0b3ea3ef29f4f26681db2b11faab36dac2e0.tar.xz forums-710a0b3ea3ef29f4f26681db2b11faab36dac2e0.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/memberlist.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 2f2c823feb..770d484d94 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1282,18 +1282,18 @@ switch ($mode) $avatar_img = phpbb_get_group_avatar($group_row); // ... same for group rank - $user_rank_data = array( + $group_rank_data = array( 'title' => null, 'img' => null, 'img_src' => null, ); if ($group_row['group_rank']) { - $user_rank_data = phpbb_get_user_rank($group_row, false); + $group_rank_data = $group_helper->get_rank($group_row); - if ($user_rank_data['img']) + if ($group_rank_data['img']) { - $user_rank_data['img'] .= '<br />'; + $group_rank_data['img'] .= '<br />'; } } // include modules for manage groups link display or not @@ -1325,11 +1325,11 @@ switch ($mode) 'GROUP_NAME' => $group_helper->get_name($group_row['group_name']), 'GROUP_COLOR' => $group_row['group_colour'], 'GROUP_TYPE' => $user->lang['GROUP_IS_' . $group_row['l_group_type']], - 'GROUP_RANK' => $user_rank_data['title'], + 'GROUP_RANK' => $group_rank_data['title'], 'AVATAR_IMG' => $avatar_img, - 'RANK_IMG' => $user_rank_data['img'], - 'RANK_IMG_SRC' => $user_rank_data['img_src'], + 'RANK_IMG' => $group_rank_data['img'], + 'RANK_IMG_SRC' => $group_rank_data['img_src'], 'U_PM' => ($auth->acl_get('u_sendpm') && $auth->acl_get('u_masspm_group') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&g=' . $group_id) : '', 'U_MANAGE' => ($can_manage_group) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_groups&mode=manage') : false,) |