summaryrefslogtreecommitdiff
path: root/plugins/mail
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/mail')
-rw-r--r--plugins/mail/init.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index a7efcf273..5b61c2355 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -70,8 +70,12 @@ class Mail extends Plugin {
$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+ $tnote = strip_tags($line["note"]);
+ if( $tnote != ''){
+ $tpl->setVariable('ARTICLE_NOTE', $tnote, true);
+ $tpl->addBlock('note');
+ }
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
- $tpl->setVariable('ARTICLE_NOTE', strip_tags($line["note"]));
$tpl->addBlock('article');
}
@@ -138,7 +142,7 @@ class Mail extends Plugin {
$mail->From = strip_tags($_REQUEST['from_email']);
$mail->FromName = strip_tags($_REQUEST['from_name']);
//$mail->AddAddress($_REQUEST['destination']);
- $addresses = preg_split('/;/', $_REQUEST['destination'],-1,PREG_SPLIT_NO_EMPTY);
+ $addresses = explode(';', $_REQUEST['destination']);
foreach($addresses as $nextaddr)
$mail->AddAddress($nextaddr);