mirror of
https://github.com/friendica/friendica
synced 2024-12-23 11:20:15 +00:00
Merge pull request #6590 from MrPetovan/bug/6585-diaspora-ignore-escaped-asterisks
Diaspora: Remove asterisk-meddling regular expression
This commit is contained in:
commit
2ed66cb03b
2 changed files with 1 additions and 4 deletions
|
@ -98,7 +98,7 @@ function babel_content()
|
|||
$html = Text\Markdown::convert($markdown);
|
||||
$results[] = [
|
||||
'title' => L10n::t('Markdown::convert (raw HTML)'),
|
||||
'content' => htmlspecialchars($html)
|
||||
'content' => visible_whitespace(htmlspecialchars($html))
|
||||
];
|
||||
|
||||
$results[] = [
|
||||
|
|
|
@ -83,9 +83,6 @@ class Markdown extends BaseObject
|
|||
{
|
||||
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
|
||||
|
||||
// Replace lonely stars in lines not starting with it with literal stars
|
||||
$s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);
|
||||
|
||||
// The parser cannot handle paragraphs correctly
|
||||
$s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);
|
||||
|
||||
|
|
Loading…
Reference in a new issue