sql typo in auto-friend with D*

[friendica.git] / include / bb2diaspora.php

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index ab124228df26714b35031a32324232b3bd6455d9..c26b0c33419882c9e6efb0fc2f54247098d9018f 100755 (executable)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -14,15 +14,20 @@ 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);
 
-       // we seem to get a lot of text smushed together with links from Diaspora.
-       // if it's a url that we haven't already parsed into a bbcode structure, put a space before it.
-       $s = preg_replace("/([^=\"\]])(https?:\/\/)/ism",'$1 $2',$s);
 
     $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s); 
     $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s); 
@@ -32,6 +37,7 @@ function diaspora2bb($s) {
        // remove duplicate adjacent code tags
        $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
        $s = scale_diaspora_images($s);
+
        return $s;
 }
 
@@ -206,7 +212,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
        $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text);
 
 
-
+       $Text = str_replace('[nosmile]','',$Text);
 
        // oembed tag
        //      $Text = oembed_bbcode2html($Text);