X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FMarkdown.php;h=2289bee869ee5ca42b885eea7b0defb903ab974d;hb=e6b1f9ef090c77ab76a9ced1f0126a1f3e8aefaf;hp=e7383a3fd79341c9e3290b34b3ee04f5e98e40e1;hpb=e2fd882134afe4bf4c5c9eed76fcaff5f08b1f4e;p=friendica.git diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php index e7383a3fd7..2289bee869 100644 --- a/src/Content/Text/Markdown.php +++ b/src/Content/Text/Markdown.php @@ -9,13 +9,12 @@ 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 * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class Markdown extends BaseObject { @@ -33,9 +32,10 @@ class Markdown extends BaseObject $MarkdownParser = new MarkdownExtra(); $MarkdownParser->hard_wrap = $hardwrap; + $MarkdownParser->code_class_prefix = 'language-'; $html = $MarkdownParser->transform($text); - self::getApp()->save_timestamp($stamp1, "parser"); + self::getApp()->saveTimestamp($stamp1, "parser"); return $html; } @@ -54,6 +54,10 @@ class Markdown extends BaseObject $data = Contact::getDetailsByAddr($match[2]); + if (empty($data)) { + return; + } + $name = $match[1]; if ($name == '') { @@ -94,7 +98,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);