diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:25:05 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:25:05 +0200 |
| commit | dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c (patch) | |
| tree | 9619c778091fe479ec69a20f946fad47470345aa /phpBB/includes/functions_user.php | |
| parent | 3c02a1cff70641ae3f5276863242452b6ab06092 (diff) | |
| parent | 5e330044b87190dcdb66aa3c83932a4c16627692 (diff) | |
| download | forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar.gz forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar.bz2 forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.tar.xz forums-dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10c.zip | |
Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
[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 d3594196b7..f2c80705ba 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) |