mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 18:26:32 +02:00
Code Issues Releases Wiki Activity

A few updates

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4168 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-06-23 15:23:52 +00:00
parent 7661a5d040
commit 464f8871fb
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_profile.php
View File

@@ -219,7 +219,7 @@ class ucp_profile extends ucp
'ICQ' => (isset($icq)) ? $icq : $user->data['user_icq'],
'YIM' => (isset($yim)) ? $yim : $user->data['user_yim'],
'AIM' => (isset($aim)) ? $aim : $user->data['user_aim'],
'MSNM' => (isset($msnm)) ? $msnm : $user->data['user_msnm'],
'MSN' => (isset($msn)) ? $msn : $user->data['user_msnm'],
'JABBER' => (isset($jabber)) ? $jabber : $user->data['user_jabber'],
'WEBSITE' => (isset($website)) ? $website : $user->data['user_website'],
'LOCATION' => (isset($location)) ? $location : $user->data['user_from'],
@@ -452,7 +452,7 @@ class ucp_profile extends ucp
'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)),
'S_FORM_ENCTYPE' => $can_upload ? ' enctype="multipart/form-data"' : '',
'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '',
'S_UPLOAD_AVATAR_FILE' => $can_upload,
'S_UPLOAD_AVATAR_URL' => $can_upload,
'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false,

4
phpBB/includes/ucp/ucp_register.php
View File

@@ -218,7 +218,7 @@ class ucp_register extends ucp
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer($config['smtp_delivery']);
$emailer->use_template($email_template, $user->data['user_lang']);
$emailer->template($email_template, $user->data['user_lang']);
$emailer->replyto($config['board_contact']);
$emailer->to($data['user_email'], $data['username']);
@@ -319,7 +319,7 @@ class ucp_register extends ucp
{
if ($row['attempts'] > 3)
{
trigger_error($user->lang['TOO_MANY_REGISTERS']);
// trigger_error($user->lang['TOO_MANY_REGISTERS']);
}
}
$db->sql_freeresult($result);