diff options
| -rw-r--r-- | phpBB/groupcp.php | 11 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/groupcp_info_body.tpl | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index 323fa94dca..cf13ce9e57 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -672,7 +672,6 @@ else if( $group_id ) "S_GROUP_OPEN_CHECKED" => ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "", "S_GROUP_CLOSED_CHECKED" => ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "", "S_GROUP_HIDDEN_CHECKED" => ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "", - "S_GROUP_INFO_ACTION" => append_sid("groupcp.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); @@ -704,7 +703,7 @@ else if( $group_id ) "S_MODE_SELECT" => $select_sort_mode, "S_ORDER_SELECT" => $select_sort_order, - "S_MODE_ACTION" => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")) + "S_GROUPCP_ACTION" => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")) ); for($i = 0; $i < $members_count; $i++) @@ -793,7 +792,7 @@ else if( $group_id ) } else { - if( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member ) + if( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator ) { $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; @@ -841,7 +840,7 @@ else if( $group_id ) ); } - if( $group_info['group_type'] == GROUP_HIDDEN && !$is_group_member ) + if( $group_info['group_type'] == GROUP_HIDDEN && !$is_group_member && !$is_moderator ) { // // No group members @@ -959,9 +958,7 @@ else if( $group_id ) $template->assign_vars(array( "L_SELECT" => $lang['Select'], "L_APPROVE_SELECTED" => $lang['Approve_selected'], - "L_DENY_SELECTED" => $lang['Deny_selected'], - - "S_PENDING_ACTION" => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $group_id)) + "L_DENY_SELECTED" => $lang['Deny_selected']) ); $template->assign_var_from_handle("PENDING_USER_BOX", "pendinginfo"); diff --git a/phpBB/templates/subSilver/groupcp_info_body.tpl b/phpBB/templates/subSilver/groupcp_info_body.tpl index e6ae6be6a5..bdbb1dcc09 100644 --- a/phpBB/templates/subSilver/groupcp_info_body.tpl +++ b/phpBB/templates/subSilver/groupcp_info_body.tpl @@ -1,5 +1,5 @@ -<form method="POST" action="{S_GROUP_INFO_ACTION}"> +<form method="post" action="{S_GROUPCP_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> @@ -39,7 +39,7 @@ {S_HIDDEN_FIELDS} </form> -<form action="{S_PENDING_ACTION}" method="post" name="post"> +<form method="post" action="{S_GROUPCP_ACTION}" name="post"> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> <th class="thCornerL" height="25">{L_PM}</th> |