diff options
| -rw-r--r-- | include/bb2diaspora.php | 20 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 49dee8759..5c93ac3aa 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -121,18 +121,6 @@ function diaspora2bb($s,$use_zrl = false) { $s = html_entity_decode($s,ENT_COMPAT,'UTF-8'); - // Too many new lines. So deactivated the following line - // $s = str_replace("\r","\n",$s); - // Simply remove cr. -// $s = str_replace("\r","",$s); - - // <br/> is invalid. Replace it with the valid expression -// $s = str_replace("<br/>","<br />",$s); -// $s = str_replace("\n","<br />",$s); - - -// $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); - // first try plustags $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}\+/','diaspora_mention_callback',$s); @@ -144,18 +132,13 @@ function diaspora2bb($s,$use_zrl = false) { // This seems to work $s = preg_replace('/\#([^\s\#])/','#$1',$s); - $s = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$s); - $s = Markdown($s); $s = str_replace("\r","",$s); $s = str_replace('#','#',$s); -// we seem to have double linebreaks -// $s = str_replace("\n",'<br />',$s); $s = html2bbcode($s); -// $s = str_replace('*','*',$s); // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands $s = str_replace('♲',html_entity_decode('♲',ENT_QUOTES,'UTF-8'),$s); @@ -178,9 +161,6 @@ function diaspora2bb($s,$use_zrl = false) { // remove duplicate adjacent code tags $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s); - $s = preg_replace_callback('/\[share(.*?)\]/ism','share_unshield',$s); - - // Don't show link to full picture (until it is fixed) $s = scale_external_images($s, false); diff --git a/version.inc b/version.inc index e18abbb77..a843ce0e3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-12-22.897 +2014-12-23.898 |