diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 18:39:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 18:39:35 +0000 |
| commit | 5029170afbe7e74a0c46b3b3f1ecca83697ced42 (patch) | |
| tree | 4762e7d8d4d3b723d681f0bf5a88f65b266978b2 /phpBB/includes/acp/acp_users.php | |
| parent | 037f0bf4da281981dd5bc0e217325d2c49531409 (diff) | |
| download | forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.gz forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.bz2 forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.xz forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.zip | |
- fixed a few smaller things
git-svn-id: file:///svn/phpbb/trunk@5952 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 66fdf40701..1a079b8e0d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -263,7 +263,7 @@ class acp_users $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], 'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), - 'USERNAME' => $user_row['username'], + 'USERNAME' => html_entity_decode($user_row['username']), 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey") @@ -1277,7 +1277,7 @@ class acp_users { $data['user_id'] = $user_id; - if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) + if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload && $config['allow_avatar_upload']) { list($type, $filename, $width, $height) = avatar_upload($data, $error); } @@ -1347,6 +1347,8 @@ class acp_users // Generate users avatar if ($user_row['user_avatar']) { + $avatar_img = ''; + switch ($user_row['user_avatar_type']) { case AVATAR_UPLOAD: @@ -1357,8 +1359,8 @@ class acp_users $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; break; } - $avatar_img .= $user_row['user_avatar']; + $avatar_img .= $user_row['user_avatar']; $avatar_img = '<img src="' . $avatar_img . '" width="' . $user_row['user_avatar_width'] . '" height="' . $user_row['user_avatar_height'] . '" alt="" />'; } else @@ -1375,7 +1377,8 @@ class acp_users $template->assign_vars(array( 'S_AVATAR' => true, - 'S_CAN_UPLOAD' => $can_upload, + 'S_CAN_UPLOAD' => ($can_upload && $config['allow_avatar_upload']) ? true : false, + 'S_ALLOW_REMOTE' => ($config['allow_avatar_remote']) ? true : false, 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, |