Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12503/plugins/serendipity_event_mailer
Modified Files:
serendipity_event_mailer.php
Log Message:
don't strip link and signature tags
Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_event_mailer.php 2 Dec 2004 10:55:01 -0000 1.8
+++ serendipity_event_mailer.php 22 Dec 2004 11:32:45 -0000 1.9
@@ -92,16 +92,18 @@
$mail = array(
'to' => $this->get_config('mailto'),
'subject' => '[' . $serendipity['blogTitle'] . '] ' . $eventData['title'],
- 'body' => $eventData['body'] . $eventData['extended'] . $serendipity['signature'],
+ 'body' => $eventData['body'] . $eventData['extended'],
'from' => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
);
- if($this->get_config('includelink') == true) {
- $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title']) . "\n\n" . $mail['body'];
+ if (serendipity_db_bool($this->get_config('striptags', false)) == true) {
+ $mail['body'] = strip_tags($mail['body']) . $serendipity['signature'];
+ } else {
+ $mail['body'] .= $serendipity['signature'];
}
- if($this->get_config('striptags') == true) {
- $mail['body'] = strip_tags($mail['body']);
+ if (serendipity_db_bool($this->get_config('includelink', false)) == true) {
+ $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title']) . "\n\n" . $mail['body'];
}
mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
|
