diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-18 16:56:37 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-18 16:56:37 -0700 |
| commit | 8764cdf16acf391c2a7abf1745e9a910f5c36662 (patch) | |
| tree | 0c8143df83c861581c649ba72a53715a09779836 /Zotlabs | |
| parent | a45dd09fc0aa08fc81b7c62a9ac6aab78487dd8e (diff) | |
| parent | 7b06cb66822da51dd0964404a359441ec3fa0d66 (diff) | |
| download | volse-hubzilla-8764cdf16acf391c2a7abf1745e9a910f5c36662.tar.gz volse-hubzilla-8764cdf16acf391c2a7abf1745e9a910f5c36662.tar.bz2 volse-hubzilla-8764cdf16acf391c2a7abf1745e9a910f5c36662.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 3 |
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)); |