makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing var preventing display of email link to users when browsing groups as group moderator or admin

Browse source 
git-svn-id: file:///svn/phpbb/trunk@2471 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-04-03 22:24:56 +00:00
parent 5a40ff47f0
commit 024a7d7b3e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/groupcp.php
View file

@ -27,7 +27,7 @@ include($phpbb_root_path . 'common.'.$phpEx);
// ------------------------- // -------------------------
// //
function generate_user_info(&$row, $date_format, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim) function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
{ {
global $lang, $images, $board_config; global $lang, $images, $board_config;
@ -52,7 +52,7 @@ function generate_user_info(&$row, $date_format, &$from, &$posts, &$joined, &$po
} }
} }
if ( !empty($row['user_viewemail']) || $userdata['user_level'] == ADMIN ) if ( !empty($row['user_viewemail']) || $group_mod )
{ {
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email']; $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email'];
@ -891,7 +891,7 @@ else if ( $group_id )
$username = $group_moderator['username']; $username = $group_moderator['username'];
$user_id = $group_moderator['user_id']; $user_id = $group_moderator['user_id'];
generate_user_info($group_moderator, $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim); generate_user_info($group_moderator, $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
$template->assign_vars(array( $template->assign_vars(array(
'L_GROUP_INFORMATION' => $lang['Group_Information'], 'L_GROUP_INFORMATION' => $lang['Group_Information'],
@ -980,7 +980,7 @@ else if ( $group_id )
$username = $group_members[$i]['username']; $username = $group_members[$i]['username'];
$user_id = $group_members[$i]['user_id']; $user_id = $group_members[$i]['user_id'];
generate_user_info($group_members[$i], $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim); generate_user_info($group_members[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator ) if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
{ {
@ -1073,7 +1073,7 @@ else if ( $group_id )
$username = $modgroup_pending_list[$i]['username']; $username = $modgroup_pending_list[$i]['username'];
$user_id = $modgroup_pending_list[$i]['user_id']; $user_id = $modgroup_pending_list[$i]['user_id'];
generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim); generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];