From 231b70b987bb76a27cc8c4a36b128b4fef2178ce Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 19 Dec 2016 16:06:49 -0800 Subject: call zidify_links() when formatting bbcode for internal consumption --- Zotlabs/Module/Wiki.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 7b0ec9d83..95f7c8704 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -215,7 +215,7 @@ class Wiki extends \Zotlabs\Web\Controller { $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { - $renderedContent = wiki_convert_links(bbcode($content),argv(0).'/'.argv(1).'/'.$wikiUrlName); + $renderedContent = wiki_convert_links(zidify_links(smilies(bbcode($content))),argv(0).'/'.argv(1).'/'.$wikiUrlName); } else { require_once('library/markdown.php'); @@ -299,7 +299,7 @@ class Wiki extends \Zotlabs\Web\Controller { $mimeType = $w['mimeType']; if($mimeType == 'text/bbcode') { - $html = wiki_convert_links(bbcode($content),$wikiURL); + $html = wiki_convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); } else { require_once('library/markdown.php'); -- cgit v1.2.3