diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-18 17:00:09 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-18 17:00:09 -0700 |
| commit | b0b96daec0deb707b2b5fed5f50c4c24bbed8e25 (patch) | |
| tree | 7673306530cc919a609c17af245498a2f9f3c898 /Zotlabs/Module | |
| parent | 320c32fd0f40f3e050ddbec3dc72561f59d7fe35 (diff) | |
| parent | 8764cdf16acf391c2a7abf1745e9a910f5c36662 (diff) | |
| download | volse-hubzilla-b0b96daec0deb707b2b5fed5f50c4c24bbed8e25.tar.gz volse-hubzilla-b0b96daec0deb707b2b5fed5f50c4c24bbed8e25.tar.bz2 volse-hubzilla-b0b96daec0deb707b2b5fed5f50c4c24bbed8e25.zip | |
Merge branch 'dev' into merge
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d24d3f6c3..28e8fe328 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -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(); |