Ajoute le support du 'richtext'... avec un jeu de balise relativement réduit

[banana.git] / banana / post.inc.php

diff --git a/banana/post.inc.php b/banana/post.inc.php
index df64f27..a1cb4d4 100644 (file)
--- a/banana/post.inc.php
+++ b/banana/post.inc.php
@@ -149,13 +149,11 @@ class BananaPost
         if ($format[1] == 'plain') {
             return $this->body;
         }
-        $res = preg_replace("@<br[^>]>@", "@@@#@", $this->body);
-        $res = trim(html_entity_decode(strip_tags($res)));
-        $res = str_replace("@@@#@", "\n", $res);
-        if (!is_utf8($res)) {
-            $res = utf8_encode($res);
+        if ($format[1] == 'richtext') {
+            return htmlToPlainText(richtextToHtml($this->body));
+        } else {
+            return htmlToPlainText($this->body);
         }
-        return $res;
     }
 
     /** decode an attachment