From 2310bf994a10996d2b6986e70d56765974581480 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 12 Mar 2017 03:55:22 -0400 Subject: [PATCH] Normalize line endings instead of adding
before Markdown() --- include/bb2diaspora.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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", '
', $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); -- 2.39.5