mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-09 10:16:36 +02:00
- 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
This commit is contained in:
@@ -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'])),
|
||||
|
@@ -475,8 +475,6 @@ function close_report($post_id_list, $mode, $action)
|
||||
// Notify reporters
|
||||
if (sizeof($notify_reporters))
|
||||
{
|
||||
$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
|
||||
|
||||
foreach ($notify_reporters as $post_id => $reporter)
|
||||
{
|
||||
if ($reporter['user_id'] == ANONYMOUS)
|
||||
@@ -491,8 +489,6 @@ function close_report($post_id_list, $mode, $action)
|
||||
$messenger->im($reporter['user_jabber'], $reporter['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($reporter['username']),
|
||||
'CLOSER_NAME' => utf8_html_entity_decode($user->data['username']),
|
||||
'POST_SUBJECT' => utf8_html_entity_decode(censor_text($post_info[$post_id]['post_subject'])),
|
||||
|
Reference in New Issue
Block a user