diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-15 13:13:04 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-15 13:13:04 +0200 |
| commit | df62037c4a722606e84e28dd4d62e89dcc999980 (patch) | |
| tree | fd65963ecb213edb478d6070e84cae33fedc0e28 /Zotlabs | |
| parent | 05b8c53ff7b96053c1095c1dc0f64bb215083feb (diff) | |
| download | volse-hubzilla-df62037c4a722606e84e28dd4d62e89dcc999980.tar.gz volse-hubzilla-df62037c4a722606e84e28dd4d62e89dcc999980.tar.bz2 volse-hubzilla-df62037c4a722606e84e28dd4d62e89dcc999980.zip | |
fix wiki issue with wiki page links when using bbcode
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 05d6e85cd..892810241 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -338,9 +338,8 @@ class Wiki extends Controller { // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { - $renderedContent = NativeWikiPage::convert_links($content,argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName)); - $renderedContent = zidify_links(smilies(bbcode($renderedContent))); - //$renderedContent = NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))), argv(0) . '/' . argv(1) . '/' . $wikiUrlName); + $renderedContent = zidify_links(smilies(bbcode($content))); + $renderedContent = NativeWikiPage::convert_links($renderedContent,argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName)); } elseif($mimeType === 'text/plain') { $renderedContent = str_replace(["\n",' ',"\t"],[EOL,' ',' '],htmlentities($content,ENT_COMPAT,'UTF-8',false)); |