diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-19 16:06:49 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-19 16:06:49 -0800 |
| commit | 231b70b987bb76a27cc8c4a36b128b4fef2178ce (patch) | |
| tree | 3b22d937f34ef66acedaabc2f6366bbcbc0ada37 /Zotlabs/Module/Wiki.php | |
| parent | 1798ebd39524354a6955e871ce231c908f5bd0cc (diff) | |
| download | volse-hubzilla-231b70b987bb76a27cc8c4a36b128b4fef2178ce.tar.gz volse-hubzilla-231b70b987bb76a27cc8c4a36b128b4fef2178ce.tar.bz2 volse-hubzilla-231b70b987bb76a27cc8c4a36b128b4fef2178ce.zip | |
call zidify_links() when formatting bbcode for internal consumption
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 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'); |