diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-04 11:43:27 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-04 11:43:27 -0800 |
| commit | 16e48a859cffb0f81f19dc847210c98ac32d8d09 (patch) | |
| tree | 09da7eda944892f4faaaa87700f212bcbcb13b69 /Zotlabs | |
| parent | 6346c005278d83df3b6b6ae0880ee48f4b5c936e (diff) | |
| parent | 3f6fe4f2be18dd99f30a2cd5e47fb3aaeee4b0b7 (diff) | |
| download | volse-hubzilla-16e48a859cffb0f81f19dc847210c98ac32d8d09.tar.gz volse-hubzilla-16e48a859cffb0f81f19dc847210c98ac32d8d09.tar.bz2 volse-hubzilla-16e48a859cffb0f81f19dc847210c98ac32d8d09.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 5b3c4c1d8..01a1bdc41 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -149,6 +149,7 @@ class Wiki extends \Zotlabs\Web\Controller { '$wikiName' => array('wikiName', t('Wiki name')), '$mimeType' => array('mimeType', t('Content type'), '', '', ['text/markdown' => 'Markdown', 'text/bbcode' => 'BB Code']), '$name' => t('Name'), + '$type' => t('Type'), '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], '$allow_cid' => $x['allow_cid'], @@ -214,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 = bbcode($content); + $renderedContent = wiki_convert_links(bbcode($content),argv(0).'/'.argv(1).'/'.$wikiUrlName); } else { require_once('library/markdown.php'); @@ -314,7 +315,7 @@ class Wiki extends \Zotlabs\Web\Controller { $mimeType = $w['mimeType']; if($mimeType == 'text/bbcode') { - $html = bbcode($content); + $html = wiki_convert_links(bbcode($content),$wikiURL); } else { require_once('library/markdown.php'); |