diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-03 17:41:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-03 17:41:21 +0000 |
| commit | c93a40ed0c8d2570dfc82719a3b56590cf7a92f8 (patch) | |
| tree | b9cf8d7a9dbc4bfcaed7212e3d844c11ae3fce49 /phpBB/includes/ucp/ucp_groups.php | |
| parent | b231c4234c513b3d9228306cf4c221e323456363 (diff) | |
| download | forums-c93a40ed0c8d2570dfc82719a3b56590cf7a92f8.tar forums-c93a40ed0c8d2570dfc82719a3b56590cf7a92f8.tar.gz forums-c93a40ed0c8d2570dfc82719a3b56590cf7a92f8.tar.bz2 forums-c93a40ed0c8d2570dfc82719a3b56590cf7a92f8.tar.xz forums-c93a40ed0c8d2570dfc82719a3b56590cf7a92f8.zip | |
Fixing the following bugs:
#8444 (language dependent buttons no longer include the dimensions to allow bigger/smaller translated images)
#8414
#8396
#8388
#8216
thanks to bartvb and kellanved for providing possible fixes...
git-svn-id: file:///svn/phpbb/trunk@7114 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index d6e5a34385..ea5acf346f 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -445,10 +445,6 @@ class ucp_groups $allow_desc_urls = request_var('desc_parse_urls', false); $allow_desc_smilies = request_var('desc_parse_smilies', false); - $data['uploadurl'] = request_var('uploadurl', ''); - $data['remotelink'] = request_var('remotelink', ''); - $delete = request_var('delete', ''); - $submit_ary = array( 'colour' => request_var('group_colour', ''), 'rank' => request_var('group_rank', 0), @@ -456,11 +452,14 @@ class ucp_groups 'message_limit' => request_var('group_message_limit', 0) ); + $data['uploadurl'] = request_var('uploadurl', ''); + $data['remotelink'] = request_var('remotelink', ''); + $data['width'] = request_var('width', ''); + $data['height'] = request_var('height', ''); + $delete = request_var('delete', ''); + if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) { - $data['width'] = request_var('width', ''); - $data['height'] = request_var('height', ''); - // Avatar stuff $var_ary = array( 'uploadurl' => array('string', true, 5, 255), @@ -667,8 +666,8 @@ class ucp_groups 'S_RANK_OPTIONS' => $rank_options, 'AVATAR_IMAGE' => $avatar_img, 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], - 'GROUP_AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', - 'GROUP_AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '', + 'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', + 'AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '', 'GROUP_TYPE_FREE' => GROUP_FREE, 'GROUP_TYPE_OPEN' => GROUP_OPEN, |