diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
| commit | 5b0bba72b1c619af2f39859ec0c262f860f991ac (patch) | |
| tree | 9fb003cf223ff6bf2e26feb78a35603dff88a471 /phpBB/groupcp.php | |
| parent | 65aa92182826eb06830626df49ab7a0210b06718 (diff) | |
| download | forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.gz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.bz2 forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.xz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.zip | |
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/groupcp.php')
| -rw-r--r-- | phpBB/groupcp.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index d86ff548e8..df0109e346 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -29,7 +29,7 @@ include($phpbb_root_path . 'common.'.$phpEx); // 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, $phpEx; $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' '; $joined = create_date($date_format, $row['user_regdate'], $board_config['board_timezone']); @@ -207,7 +207,7 @@ else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id ) // if ( !$userdata['session_logged_in'] ) { - header($header_location . ppend_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); } $sql = "SELECT ug.user_id, g.group_type @@ -308,7 +308,7 @@ else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending // if ( $cancel ) { - header($header_location . ppend_sid("groupcp.$phpEx", true)); + header($header_location . append_sid("groupcp.$phpEx", true)); } elseif ( !$userdata['session_logged_in'] ) { @@ -912,7 +912,8 @@ else if ( $group_id ) 'L_PENDING_MEMBERS' => $lang['Pending_members'], 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], 'L_PM' => $lang['Private_Message'], - 'L_EMAIL' => $lang['Email'], + 'L_EMAIL' => $lang['Email'], + 'L_POSTS' => $lang['Posts'], 'L_WEBSITE' => $lang['Website'], 'L_FROM' => $lang['Location'], 'L_ORDER' => $lang['Order'], |