diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 17:50:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 17:50:39 +0000 |
| commit | 1634814e16d052ba8738982652ba84caae1bb26d (patch) | |
| tree | 7b42b3e56ba40a6b7ef12dc476863798173318e7 /phpBB/includes/ucp/ucp_resend.php | |
| parent | daa3288a368ddac0335dde7ee2a718883bfb2fdc (diff) | |
| download | forums-1634814e16d052ba8738982652ba84caae1bb26d.tar forums-1634814e16d052ba8738982652ba84caae1bb26d.tar.gz forums-1634814e16d052ba8738982652ba84caae1bb26d.tar.bz2 forums-1634814e16d052ba8738982652ba84caae1bb26d.tar.xz forums-1634814e16d052ba8738982652ba84caae1bb26d.zip | |
- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4
- assign some default vars to email templates (we always need some basic ones)
git-svn-id: file:///svn/phpbb/trunk@6546 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_resend.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_resend.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index afa58f4e1b..ad104371a1 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -77,11 +77,8 @@ class ucp_resend $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); $messenger->assign_vars(array( - 'SITENAME' => utf8_html_entity_decode($config['sitename']), 'WELCOME_MSG' => utf8_html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), 'USERNAME' => utf8_html_entity_decode($user_row['username']), - 'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}") ); @@ -90,8 +87,7 @@ class ucp_resend $messenger->assign_vars(array( 'FAX_INFO' => $config['coppa_fax'], 'MAIL_INFO' => $config['coppa_mail'], - 'EMAIL_ADDRESS' => $user_row['user_email'], - 'SITENAME' => $config['sitename']) + 'EMAIL_ADDRESS' => $user_row['user_email']) ); } @@ -117,8 +113,6 @@ class ucp_resend $messenger->assign_vars(array( 'USERNAME' => utf8_html_entity_decode($user_row['username']), - 'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}") ); |