Merge branch 'dev' into merge

This commit is contained in:
zotlabs 2017-03-18 17:00:09 -07:00
commit b0b96daec0

View File

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