aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-11-30 13:30:50 +0100
committerMario Vavti <mario@mariovavti.com>2016-11-30 13:30:50 +0100
commitafffbb6487d8dc1806767ed2b2728ab56bf06669 (patch)
tree4f24bdcf1d1522c804db4fd0820acca4ffae94a7 /include
parent53e4b55ea3722a161b308e4891a2e84ad9ba77af (diff)
downloadvolse-hubzilla-afffbb6487d8dc1806767ed2b2728ab56bf06669.tar.gz
volse-hubzilla-afffbb6487d8dc1806767ed2b2728ab56bf06669.tar.bz2
volse-hubzilla-afffbb6487d8dc1806767ed2b2728ab56bf06669.zip
go live with wiki mimetypes - you can now choose if a wiki will contain markdown or bb-code markup
Diffstat (limited to 'include')
-rw-r--r--include/wiki.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/wiki.php b/include/wiki.php
index ac35c8546..dd5dbbe11 100644
--- a/include/wiki.php
+++ b/include/wiki.php
@@ -303,7 +303,7 @@ function wiki_get_page_content($arr) {
}
}
// TODO: Check that the files are all text files
- return array('content' => json_encode($content), 'message' => '', 'success' => true);
+ return array('content' => json_encode($content), 'mimeType' => $w['mimeType'], 'message' => '', 'success' => true);
}
}
@@ -523,7 +523,6 @@ function wiki_convert_links($s, $wikiURL) {
* @return string
*/
function wiki_generate_toc($s) {
-
if (strpos($s,'[toc]') !== false) {
//$toc_md = wiki_toc($s); // Generate Markdown-formatted list prior to HTML render
$toc_md = '<ul id="wiki-toc"></ul>'; // use the available jQuery plugin http://ndabas.github.io/toc/