aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-03 14:29:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-03 14:29:22 +0000
commitf7b51337c55f88f19f8b9406b64e7d03150efa2c (patch)
tree3b2482e66108730672abc059963c6b0b3caec061 /phpBB/includes/functions_user.php
parent58ac5df6b376ef57c333565b94698c41b02e67cf (diff)
downloadforums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar
forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.gz
forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.bz2
forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.xz
forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.zip
some language-specific adjustements
fix prune users (adding the list of users to the confirmation page) tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element) git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b41b329cce..1f4f9b2d3f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1806,7 +1806,7 @@ 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_writeable($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']) && @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)
{