diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-13 12:58:17 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-13 12:58:17 +0000 |
| commit | 290893c3a7b97d3cc0e150705906c59b7e6d4185 (patch) | |
| tree | 3de1c4e499656d87eae48e0464769b7efca4649a /phpBB/includes/ucp | |
| parent | 12de4efca49f8dea35d783db587696e37ef2355b (diff) | |
| download | forums-290893c3a7b97d3cc0e150705906c59b7e6d4185.tar forums-290893c3a7b97d3cc0e150705906c59b7e6d4185.tar.gz forums-290893c3a7b97d3cc0e150705906c59b7e6d4185.tar.bz2 forums-290893c3a7b97d3cc0e150705906c59b7e6d4185.tar.xz forums-290893c3a7b97d3cc0e150705906c59b7e6d4185.zip | |
#44745 - fix empty action in ucp groups
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9578 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 4e40f0a2a3..49ebc48684 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -41,7 +41,7 @@ class ucp_groups switch ($mode) { case 'membership': - + $this->page_title = 'UCP_USERGROUPS_MEMBER'; if ($submit || isset($_POST['change_default'])) @@ -414,7 +414,7 @@ class ucp_groups $this->page_title = 'UCP_USERGROUPS_MANAGE'; $action = (isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''); $group_id = request_var('g', 0); - + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); add_form_key('ucp_groups'); @@ -438,10 +438,10 @@ class ucp_groups { trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING); } - + $group_name = $group_row['group_name']; $group_type = $group_row['group_type']; - + $avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />'; $template->assign_vars(array( @@ -450,7 +450,7 @@ class ucp_groups 'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '', 'GROUP_DESC_DISP' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']), 'GROUP_TYPE' => $group_row['group_type'], - + 'AVATAR' => $avatar_img, 'AVATAR_IMAGE' => $avatar_img, 'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', @@ -604,7 +604,7 @@ class ucp_groups // Only set the rank, colour, etc. if it's changed or if we're adding a new // group. This prevents existing group members being updated if no changes // were made. - + $group_attributes = array(); $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'max_recipients'); foreach ($test_variables as $test) @@ -679,7 +679,7 @@ class ucp_groups { avatar_gallery($category, $avatar_select, 4); } - + $avatars_enabled = ($can_upload || ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false; $template->assign_vars(array( @@ -697,7 +697,7 @@ class ucp_groups 'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '', 'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0, 'GROUP_MAX_RECIPIENTS' => (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0, - + 'GROUP_DESC' => $group_desc_data['text'], 'S_DESC_BBCODE_CHECKED' => $group_desc_data['allow_bbcode'], 'S_DESC_URLS_CHECKED' => $group_desc_data['allow_urls'], @@ -839,6 +839,7 @@ class ucp_groups 'PAGINATION' => generate_pagination($this->u_action . "&action=$action&g=$group_id", $total_members, $config['topics_per_page'], $start), 'U_ACTION' => $this->u_action . "&g=$group_id", + 'S_UCP_ACTION' => $this->u_action . "&g=$group_id", 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=usernames'), )); @@ -896,7 +897,7 @@ class ucp_groups if (!sizeof($mark_ary)) { $start = 0; - + do { $sql = 'SELECT user_id @@ -1027,7 +1028,7 @@ class ucp_groups $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; $default = request_var('default', 0); - + if (confirm_box(true)) { // Add user/s to group |