X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplmailer.php;h=6b6fd0d8904e7271ebc816c6c321f383b131b5bf;hb=ff95a30266c7194bdff34f749121d43130f08b65;hp=b654dda1900abd84432e6d22214cdc12a5f7d59d;hpb=402390ee8d7bb3851e9cbd42781d16e7b84a2c88;p=platal.git diff --git a/classes/plmailer.php b/classes/plmailer.php index b654dda..6b6fd0d 100644 --- a/classes/plmailer.php +++ b/classes/plmailer.php @@ -1,6 +1,6 @@ template_dir = $globals->spoolroot . "/templates/"; $this->compile_dir = $globals->spoolroot . "/spool/mails_c/"; $this->config_dir = $globals->spoolroot . "/configs/"; - + array_unshift($this->plugins_dir, $globals->spoolroot."/plugins/"); $this->register_outputfilter(Array($this, 'mail_format')); $this->register_function('from', Array($this, 'setFrom')); @@ -47,6 +47,7 @@ class PlMail extends Smarty $this->register_function('bcc', Array($this, 'addBcc')); $this->register_function('subject', Array($this, 'setSubject')); $this->register_function('add_header', Array($this, 'addHeader')); + $this->assign_by_ref('globals', $globals); } public static function &get(&$mailer, $tpl) @@ -279,7 +280,7 @@ class PlMailer extends Mail_Mime { error_reporting($level); } if ($this->wiki) { - $this->setTxtBody(MiniWiki::WikiToText($this->wiki, true, 0, 78)); + $this->setTxtBody(MiniWiki::WikiToText($this->wiki, false, 0, 78)); if ($with_html) { $this->setHtmlBody('' . MiniWiki::WikiToHtml($this->wiki, true) . ''); }