diff options
author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
commit | e4ff780c1370d9f743da0fffc70b98be0c7cfe92 (patch) | |
tree | 00738becf05268632411007a93ff06407ca1917a /phpBB/includes/functions_user.php | |
parent | c4a65a469709a8ffdeb52f9d3556545993f2347a (diff) | |
parent | dbe8fb6488005c3295f839c7302a56f1de872426 (diff) | |
download | forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.gz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.bz2 forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.xz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9117] Wrong redirection after login.
[ticket/9772] Unify permissions for sending email when board_email_form is off
[ticket/7369] CPF date should always render the users selection.
[ticket/7296] Exporting styles to tar creates corrupted archives.
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 1cc7a69ad6..0eecc903e5 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2344,7 +2344,7 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu // Can we upload? 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; + $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_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) |