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 271d2e36c68a411442ef686530146e34d0662062..769bdb1219745fd68e338cc2de97f161c6477d48 100644 (file)
--- a/library/markdown.php
+++ b/library/markdown.php
@@ -1,8 +1,17 @@
 <?php
-require_once("library/parsedown/Parsedown.php");
+require_once "library/php-markdown/Michelf/MarkdownExtra.inc.php";
+use \Michelf\MarkdownExtra;
 
 function Markdown($text) {
-       $Parsedown = new Parsedown();
-       return($Parsedown->text($text));
+       $a = get_app();
+
+       $stamp1 = microtime(true);
+
+       $MarkdownParser = new MarkdownExtra();
+       $MarkdownParser->hard_wrap = true;
+       $html = $MarkdownParser->transform($text);
+
+       $a->save_timestamp($stamp1, "parser");
+
+       return $html;
 }
-?>