try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harde...

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 77a5f5c2a0b3cc6183c16feafb32d89819db3e23..f17e7b549cf90acbea2a3b0351a3fc27eb2a4c95 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -38,8 +38,8 @@ function diaspora2bb($s) {
        $s = Markdown($s);
 
        $s = str_replace('#','#',$s);
-
-       $s = str_replace("\n",'<br />',$s);
+// we seem to have double linebreaks
+//     $s = str_replace("\n",'<br />',$s);
 
        $s = html2bbcode($s);
 //     $s = str_replace('&#42;','*',$s);

diff --git a/include/bbcode.php b/include/bbcode.php
index 9071c767b692e3e25bd84699a31c67b8bb04b220..1c6ce1d45f2c5f5aa4492a7e8c7db6ac14f17659 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -93,11 +93,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
        // Convert new line chars to html <br /> tags
 
-       $Text = nl2br($Text);
+
+//     $Text = nl2br($Text);
+       $Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
+
        if($preserve_nl)
                $Text = str_replace(array("\n","\r"), array('',''),$Text);
 
 
+
        // Set up the parameters for a URL search string
        $URLSearchString = "^\[\]";
        // Set up the parameters for a MAIL search string

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 69ccf41b71de3f2212217997358c59966e898fdc..985c36eaa4499e5f03acbe72dbd52bb1159947ea 100644 (file)
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -124,7 +124,7 @@ function html2bbcode($message)
                $node->nodeValue = str_replace("\n", "\r", $node->nodeValue);
 
        $message = $doc->saveHTML();
-       $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "<br>", " ", ""), $message);
+       $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "<br />", " ", ""), $message);
        $message = preg_replace('= [\s]*=i', " ", $message);
        @$doc->loadHTML($message);
 

diff --git a/mod/babel.php b/mod/babel.php
index 9d87b47f0f5a3c16dda59476978186e232e891b8..1c881a5bd2fb54f0c74fc7ac10262fb2c171d4d2 100644 (file)
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -43,11 +43,11 @@ function babel_content(&$a) {
 
                $bbcode = diaspora2bb($diaspora);
                $o .= t("bb2dia2bb: ") . EOL. EOL; 
-               $o .= $bbcode . EOL. EOL; 
+               $o .= visible_lf($bbcode) . EOL. EOL; 
 
                $bbcode = html2bbcode($html);
                $o .= t("bb2md2html2bb: ") . EOL. EOL; 
-               $o .= $bbcode . EOL. EOL; 
+               $o .= visible_lf($bbcode) . EOL. EOL;