Use "received" instead of "created" when displaying posts in creation order

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

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 977ecd304f2728a8bba6bce1b2f3725a746d5375..a715de7e97e1debba48f30ebe558864bd42962b9 100644 (file)
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -7,8 +7,8 @@
 namespace Friendica\Content\Text;
 
 use Friendica\BaseObject;
+use Friendica\Core\System;
 use Friendica\Model\Contact;
-use Michelf\MarkdownExtra;
 
 /**
  * Friendica-specific usage of Markdown
@@ -30,13 +30,20 @@ class Markdown extends BaseObject
        public static function convert($text, $hardwrap = true) {
                $stamp1 = microtime(true);
 
-               $MarkdownParser = new MarkdownExtra();
-               $MarkdownParser->hard_wrap = $hardwrap;
-               $MarkdownParser->code_class_prefix = 'language-';
+               $MarkdownParser = new MarkdownParser();
+               $MarkdownParser->code_class_prefix  = 'language-';
+               $MarkdownParser->hard_wrap          = $hardwrap;
+               $MarkdownParser->hashtag_protection = true;
+               $MarkdownParser->url_filter_func    = function ($url) {
+                       if (strpos($url, '#') === 0) {
+                               $url = ltrim($_SERVER['REQUEST_URI'], '/') . $url;
+                       }
+                       return  $url;
+               };
+
                $html = $MarkdownParser->transform($text);
-               $html = preg_replace('/<a(.*?)href="#/is', '<a$1href="' . ltrim($_SERVER['REQUEST_URI'], '/') . '#', $html);
 
-               self::getApp()->saveTimestamp($stamp1, "parser");
+               self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());
 
                return $html;
        }
@@ -83,9 +90,6 @@ class Markdown extends BaseObject
        {
                $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
 
-               // 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(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);