diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:10:17 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:10:17 +0200 |
| commit | a2918fd98e61db0e7e9885fb546abc024c84d0fc (patch) | |
| tree | 9fa6b52d6bb55ec5256c67e821550e111ee50dbe /phpBB/includes/functions_user.php | |
| parent | 31b221ae913c49fa2e2a776bd9fd54659728fcd0 (diff) | |
| parent | 6da582e8be50fa7211706625402215f6f87ed48b (diff) | |
| download | forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.gz forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.bz2 forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.xz forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9704] Fix minor typo in coding guidelines.
[ticket/9690] Add forthcoming Bing Bot to list of recognized bots
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
[ticket/9593] A readme file for unit tests and running unit tests.
[ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
[ticket/9589] Added sample nginx configuration file for phpbb.
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) { |