Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

[friendica.git] / library / markdown.php

diff --git a/library/markdown.php b/library/markdown.php
index 83082f7ca77072a4eee47ef82bca1ccba814c1a8..769bdb1219745fd68e338cc2de97f161c6477d48 100644 (file)
--- a/library/markdown.php
+++ b/library/markdown.php
@@ -1,13 +1,17 @@
 <?php
-require_once("library/parsedown/Parsedown.php");
+require_once "library/php-markdown/Michelf/MarkdownExtra.inc.php";
+use \Michelf\MarkdownExtra;
 
 function Markdown($text) {
+       $a = get_app();
 
-       // Bugfix for the library:
-       // "[Title](http://domain.tld/ )" isn't handled correctly
-       $text = preg_replace("/\[(.*?)\]\s*?\(\s*?(\S*?)\s*?\)/ism", '[$1]($2)', $text);
+       $stamp1 = microtime(true);
 
-       $Parsedown = new Parsedown();
-       return($Parsedown->text($text));
+       $MarkdownParser = new MarkdownExtra();
+       $MarkdownParser->hard_wrap = true;
+       $html = $MarkdownParser->transform($text);
+
+       $a->save_timestamp($stamp1, "parser");
+
+       return $html;
 }
-?>