aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorKlaus <Klaus.Weidenbach@gmx.net>2017-03-18 14:19:47 +0100
committerGitHub <noreply@github.com>2017-03-18 14:19:47 +0100
commit7b06cb66822da51dd0964404a359441ec3fa0d66 (patch)
tree2dffae54b23c0d32500505f6a96e4cf3be486f13 /Zotlabs
parent16df1c1ad4251db369a9b90889c12c186a2f12fb (diff)
parentcbd401c3e8f7d20a32089af9074c60e266f30da7 (diff)
downloadvolse-hubzilla-7b06cb66822da51dd0964404a359441ec3fa0d66.tar.gz
volse-hubzilla-7b06cb66822da51dd0964404a359441ec3fa0d66.tar.bz2
volse-hubzilla-7b06cb66822da51dd0964404a359441ec3fa0d66.zip
Merge pull request #698 from dawnbreak/dev
Missed one old Markdown()
Diffstat (limited to 'Zotlabs')
-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));