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/acp/acp_inactive.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/acp/acp_inactive.php')
| -rwxr-xr-x | phpBB/includes/acp/acp_inactive.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 616360f422..5404393f69 100755 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -96,7 +96,6 @@ class acp_inactive $messenger = new messenger(); $board_url = generate_board_url() . "/ucp.$phpEx?mode=activate"; - $sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']); $usernames = array(); do @@ -108,11 +107,8 @@ class acp_inactive $messenger->im($row['user_jabber'], $row['username']); $messenger->assign_vars(array( - 'EMAIL_SIG' => utf8_html_entity_decode($sig), 'USERNAME' => utf8_html_entity_decode($row['username']), - 'SITENAME' => utf8_html_entity_decode($config['sitename']), 'REGISTER_DATE' => $user->format_date($row['user_regdate']), - 'U_ACTIVATE' => "$board_url&mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey']) ); |