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/mcp | |
| 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/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 8 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index e43a861cb9..e1721fd1f4 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -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'])), diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index f9103dcd40..78ac590706 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -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'])), |