aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_activate.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-03 17:50:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-03 17:50:39 +0000
commit1634814e16d052ba8738982652ba84caae1bb26d (patch)
tree7b42b3e56ba40a6b7ef12dc476863798173318e7 /phpBB/includes/ucp/ucp_activate.php
parentdaa3288a368ddac0335dde7ee2a718883bfb2fdc (diff)
downloadforums-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_activate.php')
-rw-r--r--phpBB/includes/ucp/ucp_activate.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 6a23498fe6..ae37dc1fa8 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -93,10 +93,7 @@ class ucp_activate
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array(
- 'SITENAME' => utf8_html_entity_decode($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'])))
+ 'USERNAME' => utf8_html_entity_decode($user_row['username']))
);
$messenger->send($user_row['user_notify_type']);