X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnewsletter.inc.php;h=63025a3cb1a241bc486270f06d9bd85e8c982394;hb=02fdd1c889526931990ed2f1cae1fc9a8b2d9459;hp=eb0a6a5632c3daa9ca0c5b17167f0ee929fca107;hpb=16cd99fb32e14082c9745ba6d1fbc29a6aa5ae51;p=platal.git diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index eb0a6a5..63025a3 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -31,7 +31,7 @@ class NewsLetter extends MassMailer function __construct($id = null) { - parent::__construct('newsletter/nl.tpl', 'nl.css', 'nl/show'); + parent::__construct('newsletter/nl.tpl', 'nl.css', 'nl/show', 'newsletter', 'newsletter_ins'); if (isset($id)) { if ($id == 'last') { $res = XDB::query("SELECT MAX(id) FROM newsletter WHERE bits!='new'"); @@ -146,11 +146,6 @@ class NewsLetter extends MassMailer VALUES ({?}, 0)", $user); } - protected function subscriptionTable() - { - return 'newsletter_ins'; - } - protected function subscriptionWhere() { return '1'; @@ -231,8 +226,8 @@ class NLArticle public function toText() { $title = '*'.$this->title().'*'; - $body = enriched_to_text($this->_body,false,true); - $app = enriched_to_text($this->_append,false,false,4); + $body = MiniWiki::WikiToText($this->_body,true); + $app = MiniWiki::WikiToText($this->_append,false,4); return trim("$title\n\n$body\n\n$app")."\n"; } @@ -241,9 +236,9 @@ class NLArticle public function toHtml() { - $title = "