diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-07-03 21:33:24 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-07-03 21:33:24 +0200 |
| commit | d0961068247ce57ba0eb45afc078cacb44b87810 (patch) | |
| tree | f9372689e943a522f4c0bd417d4458474aee0cfd /Zotlabs/Module/Wiki.php | |
| parent | 562124c29f821b046bc4cf4b48a7bde39c70a07b (diff) | |
| parent | 64cad0a041e44940f75bf351fc3755b3202f9029 (diff) | |
| download | volse-hubzilla-d0961068247ce57ba0eb45afc078cacb44b87810.tar.gz volse-hubzilla-d0961068247ce57ba0eb45afc078cacb44b87810.tar.bz2 volse-hubzilla-d0961068247ce57ba0eb45afc078cacb44b87810.zip | |
merge red into hubzilla
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
| -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 2f1fa01b7..85481754f 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -355,6 +355,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(); |