Only escape leading hash marks in Markdown::toBBCode
- Remove useless line ending fiddling
This commit is contained in:
parent
51e669616a
commit
e5647be30f
1 changed files with 2 additions and 9 deletions
|
@ -82,27 +82,20 @@ class Markdown extends BaseObject
|
||||||
{
|
{
|
||||||
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
|
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
|
||||||
|
|
||||||
// Handles single newlines
|
|
||||||
$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
|
// 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);
|
||||||
|
|
||||||
// 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);
|
||||||
|
|
||||||
// Escaping the hash tags
|
// Escaping hashtags that could be titles
|
||||||
$s = preg_replace('/\#([^\s\#])/', '#$1', $s);
|
$s = preg_replace('/^\#([^\s\#])/im', '\#$1', $s);
|
||||||
|
|
||||||
$s = self::convert($s);
|
$s = self::convert($s);
|
||||||
|
|
||||||
$regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/";
|
$regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/";
|
||||||
$s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
|
$s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
|
||||||
|
|
||||||
$s = str_replace('#', '#', $s);
|
|
||||||
|
|
||||||
$s = HTML::toBBCode($s);
|
$s = HTML::toBBCode($s);
|
||||||
|
|
||||||
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
|
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
|
||||||
|
|
Loading…
Reference in a new issue