Merge pull request #6223 from annando/ap-dba-error

[friendica.git] / src / Content / Text / Markdown.php

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 0e6846ebf5166e22e25abd02c2fe0f7d50761df1..2289bee869ee5ca42b885eea7b0defb903ab974d 100644 (file)
--- 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 <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 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 == '') {
@@ -87,14 +91,14 @@ class Markdown extends BaseObject
                // Escaping the hash tags
                $s = preg_replace('/\#([^\s\#])/', '&#35;$1', $s);
 
-               $s = Markdown::convert($s);
+               $s = self::convert($s);
 
                $regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
                $s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
 
                $s = str_replace('&#35;', '#', $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('&#x2672;', html_entity_decode('&#x2672;', ENT_QUOTES, 'UTF-8'), $s);