diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-23 15:23:52 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-23 15:23:52 +0000 |
| commit | 464f8871fbf3834bac29bab1e90cb13dfcf6ed1d (patch) | |
| tree | 46e4215c3816b01fca25e1f740514c734e2e56b8 /phpBB/includes | |
| parent | 7661a5d040a3827e9ab39b825b47a8f036cda21b (diff) | |
| download | forums-464f8871fbf3834bac29bab1e90cb13dfcf6ed1d.tar forums-464f8871fbf3834bac29bab1e90cb13dfcf6ed1d.tar.gz forums-464f8871fbf3834bac29bab1e90cb13dfcf6ed1d.tar.bz2 forums-464f8871fbf3834bac29bab1e90cb13dfcf6ed1d.tar.xz forums-464f8871fbf3834bac29bab1e90cb13dfcf6ed1d.zip | |
A few updates
git-svn-id: file:///svn/phpbb/trunk@4168 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 46848e93e0..f08f30d947 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -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, diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index ebab524148..fea23ccbe6 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -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); |