mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Normalize line endings instead of adding <br> before Markdown()

Browse source
This commit is contained in:
Hypolite Petovan 2017-03-12 03:55:22 -04:00
parent 3fa4605ace
commit 2310bf994a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/bb2diaspora.php
View file

@ -39,9 +39,9 @@ function diaspora2bb($s) {
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8'); $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
// Handles single newlines // 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("\n", " \n", $s);
$s = str_replace("\r", " \n", $s);
// Replace lonely stars in lines not starting with it with literal stars // Replace lonely stars in lines not starting with it with literal stars
$s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s); $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);