improvements in d* markdown conversion

diff --git a/boot.php b/boot.php
index 696c9add23d706082170d119712f5aaf6b00bd79..9b192853c5c73c83212f3adaa1771536a0e44e80 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1241' );
+define ( 'FRIENDICA_VERSION',      '2.3.1242' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1119      );
 

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index d367b6716678ede92306685a5dba102d27c8ee2d..9a29b05a2a8549e5673769739f8efbdf84637bcb 100755 (executable)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -14,9 +14,17 @@ require_once('include/html2bbcode.php');
 function diaspora2bb($s) {
 
        $s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
+    $s = str_replace("\r","\n",$s);
 
        $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
+
+    $s = preg_replace('/\#([^\s\#])/','\\#$1',$s);
+
        $s = Markdown($s);
+
+    $s = str_replace('#','#',$s);
+    $s = str_replace("\n",'<br />',$s);
+
        $s = html2bbcode($s);
 //     $s = str_replace('&#42;','*',$s);
 
@@ -30,11 +38,6 @@ function diaspora2bb($s) {
        $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
        $s = scale_diaspora_images($s);
 
-       // we seem to get a lot of text smushed together with links from Diaspora.
-
-       $s = preg_replace('/[^ ]\[url\=(.*?)\]/',' [url=$1]' ,$s);
-       $s = preg_replace('/\[\/url\][^ ]/','[/url] ',$s);
-
        return $s;
 }