aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-12-04 12:51:23 +0100
committerMario Vavti <mario@mariovavti.com>2016-12-04 12:51:23 +0100
commitb12d4c03cbc2627774b279f17a413860d868e854 (patch)
tree10acf01c398ad51bbf51e8f41ea4bda64963f122 /Zotlabs/Module
parent792527d456a031696f93015fb4fc91e60dee151b (diff)
downloadvolse-hubzilla-b12d4c03cbc2627774b279f17a413860d868e854.tar.gz
volse-hubzilla-b12d4c03cbc2627774b279f17a413860d868e854.tar.bz2
volse-hubzilla-b12d4c03cbc2627774b279f17a413860d868e854.zip
fixes for toc bbcode and bbcode wiki toc
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Wiki.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 5b3c4c1d8..da23d67a2 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -214,7 +214,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 +314,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');