aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-15 11:13:04 +0000
committerMario <mario@mariovavti.com>2018-10-15 13:14:30 +0200
commit5b43db7171d8b42a99be23c8c4958a800d2fb7c5 (patch)
treef0ff3f314123096e98bc2eb4c0a192b4a155b7a3
parentad1cc82b38685d7d9eead51e592d87eb1c2a5660 (diff)
downloadvolse-hubzilla-5b43db7171d8b42a99be23c8c4958a800d2fb7c5.tar.gz
volse-hubzilla-5b43db7171d8b42a99be23c8c4958a800d2fb7c5.tar.bz2
volse-hubzilla-5b43db7171d8b42a99be23c8c4958a800d2fb7c5.zip
fix wiki issue with wiki page links when using bbcode
(cherry picked from commit df62037c4a722606e84e28dd4d62e89dcc999980)
-rw-r--r--Zotlabs/Module/Wiki.php5
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,'&nbsp;','&nbsp;&nbsp;&nbsp;&nbsp;'],htmlentities($content,ENT_COMPAT,'UTF-8',false));