X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FMarkdown.php;h=ceb5b043b3065ba045c27891fc0138df916afd31;hb=4a501e4e46f9207e00d9fda4b294386c0aff770c;hp=994d9683349928f9213a25cd49865559684a273e;hpb=cd48b7a68e6cac7753aa8802b236ba03a6e355d8;p=friendica.git diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php index 994d968334..ceb5b043b3 100644 --- a/src/Content/Text/Markdown.php +++ b/src/Content/Text/Markdown.php @@ -9,7 +9,6 @@ namespace Friendica\Content\Text; use Friendica\BaseObject; use Friendica\Model\Contact; use Michelf\MarkdownExtra; -use Friendica\Content\Text\HTML; /** * Friendica-specific usage of Markdown @@ -26,6 +25,7 @@ class Markdown extends BaseObject * @param string $text * @param bool $hardwrap * @return string + * @throws \Exception */ public static function convert($text, $hardwrap = true) { $stamp1 = microtime(true); @@ -34,6 +34,7 @@ class Markdown extends BaseObject $MarkdownParser->hard_wrap = $hardwrap; $MarkdownParser->code_class_prefix = 'language-'; $html = $MarkdownParser->transform($text); + $html = preg_replace('/saveTimestamp($stamp1, "parser"); @@ -48,6 +49,8 @@ class Markdown extends BaseObject * [2] = name (optional) * [3] = address * @return string Replaced mention + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function diasporaMention2BBCodeCallback($match) { @@ -80,27 +83,17 @@ class Markdown extends BaseObject { $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 - $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s); - // The parser cannot handle paragraphs correctly $s = str_replace(['
', '', '
'], ['
', '
', '
'], $s);
- // Escaping the hash tags
- $s = preg_replace('/\#([^\s\#])/', '#$1', $s);
+ // Escaping hashtags that could be titles
+ $s = preg_replace('/^\#([^\s\#])/im', '\#$1', $s);
$s = self::convert($s);
$regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/";
$s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
- $s = str_replace('#', '#', $s);
-
$s = HTML::toBBCode($s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands