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/ucp | |
| 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/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 423d9b718a..1c055a4823 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -490,7 +490,7 @@ class ucp_groups $avatar_select = basename(request_var('avatar_select', '')); $category = basename(request_var('category', '')); - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; + $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; // Did we submit? if ($update) diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 4fd25b7d1c..c099e3b3fa 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -561,7 +561,7 @@ class ucp_profile $avatar_select = basename(request_var('avatar_select', '')); $category = basename(request_var('category', '')); - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; + $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; add_form_key('ucp_avatar'); |