bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6590 from MrPetovan/bug/6585-diaspora-ignore-escaped-asterisks

Browse source 
Diaspora: Remove asterisk-meddling regular expression
This commit is contained in:
Tobias Diekershoff 2019-02-05 07:49:54 +01:00 committed by GitHub
parent cf9a65cded a96e9f248e
commit 2ed66cb03b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/babel.php
View file

@ -98,7 +98,7 @@ function babel_content()
$html = Text\Markdown::convert($markdown); $html = Text\Markdown::convert($markdown);
$results[] = [ $results[] = [
'title' => L10n::t('Markdown::convert (raw HTML)'), 'title' => L10n::t('Markdown::convert (raw HTML)'),
'content' => htmlspecialchars($html) 'content' => visible_whitespace(htmlspecialchars($html))
]; ];
$results[] = [ $results[] = [

3
src/Content/Text/Markdown.php
View file

@ -83,9 +83,6 @@ class Markdown extends BaseObject
{ {
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8'); $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 // The parser cannot handle paragraphs correctly
$s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s); $s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);