- 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

phpBB/includes/acp/acp_email.php

@@ -155,9 +155,7 @@ class acp_email
 					$messenger->set_mail_priority($priority);
 
 					$messenger->assign_vars(array(
-						'SITENAME'		=> utf8_html_entity_decode($config['sitename']),
 						'CONTACT_EMAIL' => $config['board_contact'],
-						'EMAIL_SIG'		=> utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
 						'MESSAGE'		=> utf8_html_entity_decode($message))
 					);