friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3222 from Hypolite/issue/#3220 

Diaspora: Normalize line endings instead of adding <br> before Markdown()
This commit is contained in:
Tobias Diekershoff 2017-03-12 15:35:42 +01:00 committed by GitHub
parent 30d82f4391 2310bf994a
commit e29d7f19d1
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');
// 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);