aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-18 17:29:38 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-18 17:29:38 +0100
commit56f32104d53ea3caaaa1770fd031a1f54a43e924 (patch)
treeb6c348bc4ead9cd78bbaac6cc25963550dbbc06c
parent2556d05602906bbace27c796de2f5b3cbacd4448 (diff)
parent7b06cb66822da51dd0964404a359441ec3fa0d66 (diff)
downloadvolse-hubzilla-56f32104d53ea3caaaa1770fd031a1f54a43e924.tar.gz
volse-hubzilla-56f32104d53ea3caaaa1770fd031a1f54a43e924.tar.bz2
volse-hubzilla-56f32104d53ea3caaaa1770fd031a1f54a43e924.zip
Merge branch 'dev' into bs4
-rw-r--r--Zotlabs/Module/Wiki.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 5e7307c7b..42de8db50 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -327,9 +327,8 @@ class Wiki extends \Zotlabs\Web\Controller {
$html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL);
}
else {
- require_once('library/markdown.php');
$content = Zlib\NativeWikiPage::bbcode($content);
- $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown($content))));
+ $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(MarkdownExtra::defaultTransform($content))));
$html = Zlib\NativeWikiPage::convert_links($html,$wikiURL);
}
json_return_and_die(array('html' => $html, 'success' => true));