X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbb2diaspora.php;h=e5099992366558b722c8c27fb635713bc24a4f6c;hb=f94a10bf00de699a5f3d22ea74665053a5661175;hp=f18a0f3c276399cea0910a0e80df320577b85b03;hpb=45ebeba643a6d600e8778475f70f827f32bf3146;p=friendica.git

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index f18a0f3c27..e509999236 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -39,9 +39,9 @@ function diaspora2bb($s) {
 	$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
 
 	// Handles single newlines
-	$s = str_replace("\r", '<br>', $s);
-
+	$s = str_replace("\r\n", "\n", $s);
 	$s = str_replace("\n", " \n", $s);
+	$s = str_replace("\r", " \n", $s);
 
 	// Replace lonely stars in lines not starting with it with literal stars
 	$s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);