harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge

Browse Source
This commit is contained in:
zotlabs 2017-03-18 17:00:09 -07:00
commit b0b96daec0
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Wiki.php
View File

@ -330,6 +330,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); $html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL);
} }
else { else {
$bb = Zlib\NativeWikiPage::bbcode($content); $bb = Zlib\NativeWikiPage::bbcode($content);
$x = new ZLib\MarkdownSoap($bb); $x = new ZLib\MarkdownSoap($bb);
$md = $x->clean(); $md = $x->clean();