diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 19:52:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 19:52:29 +0200 |
| commit | c3db21bfa2a01a3de6fd520f99b0399d8cdf5748 (patch) | |
| tree | 9f8dd32b7ea90e365f0c62731258fceb4768f0e3 /phpBB/includes/functions_user.php | |
| parent | f92c96d424a764b31ccbadc8fc2eafab594a04a3 (diff) | |
| parent | e130a6bad94f534b3e573efcdb2b94332426598e (diff) | |
| download | forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar.gz forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar.bz2 forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar.xz forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.zip | |
Merge branch 'ticket/bantu/9451' into develop-olympus
* ticket/bantu/9451:
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 93e4e6db07..bb99314ced 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2284,7 +2284,7 @@ function avatar_get_dimensions($avatar, $avatar_type, &$error, $current_x = 0, $ /** * Uploading/Changing user avatar */ -function avatar_process_user(&$error, $custom_userdata = false) +function avatar_process_user(&$error, $custom_userdata = false, $can_upload = null) { global $config, $phpbb_root_path, $auth, $user, $db; @@ -2323,7 +2323,10 @@ function avatar_process_user(&$error, $custom_userdata = false) $avatar_select = basename(request_var('avatar_select', '')); // Can we upload? - $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; + if (is_null($can_upload)) + { + $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; + } if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) { |