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); diff --git a/phpBB/templates/subSilver/posting_attach_body.html b/phpBB/templates/subSilver/posting_attach_body.html index fbf5816245..8b967ba33e 100644 --- a/phpBB/templates/subSilver/posting_attach_body.html +++ b/phpBB/templates/subSilver/posting_attach_body.html @@ -8,11 +8,11 @@ - {L_FILENAME} + {L_FILENAME} - {L_FILE_COMMENT} + {L_FILE_COMMENT}   @@ -24,11 +24,11 @@ - {L_FILENAME} - {attach_row.FILENAME} + {L_FILENAME} + {attach_row.FILENAME} - {L_FILE_COMMENT} + {L_FILE_COMMENT}     diff --git a/phpBB/templates/subSilver/posting_body.html b/phpBB/templates/subSilver/posting_body.html index 30a876b8fb..a12bea7767 100644 --- a/phpBB/templates/subSilver/posting_body.html +++ b/phpBB/templates/subSilver/posting_body.html @@ -116,24 +116,24 @@ function checkForm() - {ERROR_MESSAGE} + {ERROR_MESSAGE} - {L_DELETE_POST} + {L_DELETE_POST} [ {L_DELETE_POST_WARN} ] - {L_USERNAME} + {L_USERNAME} - {L_ICON} + {L_ICON} @@ -142,11 +142,11 @@ function checkForm() - + -
{L_NONE}
{L_SUBJECT}{L_SUBJECT}
{L_MESSAGE_BODY}
{L_MESSAGE_BODY_EXPLAIN}

+ -
{L_MESSAGE_BODY}
{L_MESSAGE_BODY_EXPLAIN}

@@ -204,7 +204,7 @@ function checkForm()
{L_EMOTICONS}
{L_OPTIONS}
+
{L_OPTIONS}
@@ -266,7 +266,7 @@ function checkForm() - +
{HTML_STATUS}
{L_MOD_OPTIONS}{L_MOD_OPTIONS} diff --git a/phpBB/templates/subSilver/posting_poll_body.html b/phpBB/templates/subSilver/posting_poll_body.html index 56234cb341..9fbbe62c10 100644 --- a/phpBB/templates/subSilver/posting_poll_body.html +++ b/phpBB/templates/subSilver/posting_poll_body.html @@ -7,24 +7,24 @@ - + - + - + - + - + diff --git a/phpBB/templates/subSilver/ucp_register.html b/phpBB/templates/subSilver/ucp_register.html index 6d2bbfea0f..d5f2e4e397 100644 --- a/phpBB/templates/subSilver/ucp_register.html +++ b/phpBB/templates/subSilver/ucp_register.html @@ -27,23 +27,23 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - +
{L_ADD_POLL_EXPLAIN}
{L_POLL_QUESTION}{L_POLL_QUESTION}
{L_POLL_OPTIONS}
{L_POLL_OPTIONS_EXPLAIN}		{L_POLL_OPTIONS}
{L_POLL_OPTIONS_EXPLAIN}
{L_POLL_MAX_OPTIONS}
{L_POLL_MAX_OPTIONS_EXPLAIN}		{L_POLL_MAX_OPTIONS}
{L_POLL_MAX_OPTIONS_EXPLAIN}
{L_POLL_FOR}{L_POLL_FOR}  {L_DAYS} {L_POLL_FOR_EXPLAIN}
{L_POLL_DELETE}{L_POLL_DELETE}
{L_USERNAME}:
{L_USERNAME_EXPLAIN}
{L_EMAIL_ADDRESS}:
{L_CONFIRM_EMAIL}:
{L_NEW_PASSWORD}:
{L_NEW_PASSWORD_EXPLAIN}
{L_CONFIRM_PASSWORD}:
{L_LANGUAGE}:
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}