X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FMarkdown.php;h=71d1a7b849c92dd7aab25bf8e7de105ea42ba1e2;hb=eaf81e5e66db1f722192005ff75bb5831c1912eb;hp=e7383a3fd79341c9e3290b34b3ee04f5e98e40e1;hpb=cc688e2b4f52afda5c54a14492c57273f97b23a2;p=friendica.git diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php index e7383a3fd7..71d1a7b849 100644 --- a/src/Content/Text/Markdown.php +++ b/src/Content/Text/Markdown.php @@ -9,8 +9,7 @@ namespace Friendica\Content\Text; use Friendica\BaseObject; use Friendica\Model\Contact; use Michelf\MarkdownExtra; - -require_once 'include/html2bbcode.php'; +use Friendica\Content\Text\HTML; /** * Friendica-specific usage of Markdown @@ -54,6 +53,10 @@ class Markdown extends BaseObject $data = Contact::getDetailsByAddr($match[2]); + if (empty($data)) { + return; + } + $name = $match[1]; if ($name == '') { @@ -94,7 +97,7 @@ class Markdown extends BaseObject $s = str_replace('#', '#', $s); - $s = html2bbcode($s); + $s = HTML::toBBCode($s); // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands $s = str_replace('♲', html_entity_decode('♲', ENT_QUOTES, 'UTF-8'), $s);