mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4

Browse Source 
- 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
This commit is contained in:
Meik Sievertsen
2006-11-03 17:50:39 +00:00
parent daa3288a36
commit 1634814e16
20 changed files with 83 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/mcp/mcp_queue.php
View File

@@ -519,8 +519,6 @@ function approve_post($post_id_list, $mode)
// Notify Poster?
if ($notify_poster)
{
$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
foreach ($post_info as $post_id => $post_data)
{
if ($post_data['poster_id'] == ANONYMOUS)
@@ -537,8 +535,6 @@ function approve_post($post_id_list, $mode)
$messenger->im($post_data['user_jabber'], $post_data['username']);
$messenger->assign_vars(array(
'EMAIL_SIG' => utf8_html_entity_decode($email_sig),
'SITENAME' => utf8_html_entity_decode($config['sitename']),
'USERNAME' => utf8_html_entity_decode($post_data['username']),
'POST_SUBJECT' => utf8_html_entity_decode(censor_text($post_data['post_subject'])),
'TOPIC_TITLE' => utf8_html_entity_decode(censor_text($post_data['topic_title'])),
@@ -734,8 +730,6 @@ function disapprove_post($post_id_list, $mode)
// Notify Poster?
if ($notify_poster)
{
$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
foreach ($post_info as $post_id => $post_data)
{
if ($post_data['poster_id'] == ANONYMOUS)
@@ -752,8 +746,6 @@ function disapprove_post($post_id_list, $mode)
$messenger->im($post_data['user_jabber'], $post_data['username']);
$messenger->assign_vars(array(
'EMAIL_SIG' => utf8_html_entity_decode($email_sig),
'SITENAME' => utf8_html_entity_decode($config['sitename']),
'USERNAME' => utf8_html_entity_decode($post_data['username']),
'REASON' => utf8_html_entity_decode($disapprove_reason),
'POST_SUBJECT' => utf8_html_entity_decode(censor_text($post_data['post_subject'])),