diff options
| author | zotlabs <mike@macgirvin.com> | 2018-12-17 18:45:42 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-12-17 18:45:42 -0800 |
| commit | 15ce8bc79b219e10f709796c09c739649a8df53b (patch) | |
| tree | edd456a39ad0daf12d6cc4409a99477f4fb38d82 /Zotlabs/Module/Wiki.php | |
| parent | 8d70b919551f6f6462e639f7cfffda9825344e43 (diff) | |
| parent | d190b1995b0886b430beb5dac1a1e72582b9ad2b (diff) | |
| download | volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.gz volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.tar.bz2 volse-hubzilla-15ce8bc79b219e10f709796c09c739649a8df53b.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 892810241..502f96a62 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -442,8 +442,8 @@ class Wiki extends Controller { $mimeType = $_POST['mimetype']; if($mimeType === 'text/bbcode') { - $linkconverted = NativeWikiPage::convert_links($content,$wikiURL); - $html = zidify_links(smilies(bbcode($linkconverted))); + $html = zidify_links(smilies(bbcode($content))); + $html = NativeWikiPage::convert_links($html,$wikiURL); } elseif($mimeType === 'text/markdown') { $linkconverted = NativeWikiPage::convert_links($content,$wikiURL); |