From 834e0ff778bf25ce3137b29aa3adead062bf7a65 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 4 Apr 2014 10:45:40 +0200 Subject: [PATCH] Diaspora: The HTML paragraph element was treated wrong when importing items from Diaspora --- include/bb2diaspora.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 59d0e8822..5b990bf0d 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -27,7 +27,9 @@ function diaspora2bb($s) { $s = str_replace("\r","",$s); //
is invalid. Replace it with the valid expression - $s = str_replace("
","
",$s); + logger("diaspora2bb: 1: ".$s); + $s = str_replace(array("
", "

", "

"),array("
", "
", "
"),$s); + logger("diaspora2bb: 2: ".$s); $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);