From 5b43db7171d8b42a99be23c8c4958a800d2fb7c5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 15 Oct 2018 11:13:04 +0000 Subject: fix wiki issue with wiki page links when using bbcode (cherry picked from commit df62037c4a722606e84e28dd4d62e89dcc999980) --- Zotlabs/Module/Wiki.php | 5 ++--- 1 file 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)); -- cgit v1.2.3