diff options
| author | Fyorl <gaelreth@gmail.com> | 2012-08-15 15:14:52 +0100 |
|---|---|---|
| committer | Fyorl <gaelreth@gmail.com> | 2012-08-15 15:14:52 +0100 |
| commit | 94ed66c777d22e16ba73d317889707b90f755878 (patch) | |
| tree | cdab44d015fe41430cbb5b48217fe8ede0bffd98 /phpBB/includes | |
| parent | 83a53eb985d17f203d8ef0d33291c1ad1c4db84c (diff) | |
| download | forums-94ed66c777d22e16ba73d317889707b90f755878.tar forums-94ed66c777d22e16ba73d317889707b90f755878.tar.gz forums-94ed66c777d22e16ba73d317889707b90f755878.tar.bz2 forums-94ed66c777d22e16ba73d317889707b90f755878.tar.xz forums-94ed66c777d22e16ba73d317889707b90f755878.zip | |
[ticket/10939] Modified acp_groups.php to not use $_FILES
PHPBB3-10939
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index f88fa76df1..b018faf968 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -26,6 +26,7 @@ class acp_groups { global $config, $db, $user, $auth, $template, $cache; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads; + global $request; $user->add_lang('acp/groups'); $this->tpl_name = 'acp_groups'; @@ -323,7 +324,8 @@ class acp_groups $submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0; } - if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) + $uploadfile = $request->file('uploadfile'); + if (!empty($uploadfile['tmp_name']) || $data['uploadurl'] || $data['remotelink']) { // Avatar stuff $var_ary = array( @@ -337,7 +339,7 @@ class acp_groups { $data['user_id'] = "g$group_id"; - if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) + if ((!empty($uploadfile['tmp_name']) || $data['uploadurl']) && $can_upload) { list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error); } |