diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-08-04 19:45:35 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-08-04 19:45:35 -0400 |
| commit | 6a82ff871f56233756c2036d307e5cfffbfab325 (patch) | |
| tree | 39accfd827de22b840dbc1fab9e31463dde5e994 | |
| parent | 05a9f0aa1473e155c7f0ac27ef733bf174e49abd (diff) | |
| download | volse-hubzilla-6a82ff871f56233756c2036d307e5cfffbfab325.tar.gz volse-hubzilla-6a82ff871f56233756c2036d307e5cfffbfab325.tar.bz2 volse-hubzilla-6a82ff871f56233756c2036d307e5cfffbfab325.zip | |
Parse bbcode when page loads
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 4 | ||||
| -rw-r--r-- | include/wiki.php | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 2e3dbb673..24a0b6e1c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -142,8 +142,8 @@ class Wiki extends \Zotlabs\Web\Controller { } $content = ($p['content'] !== '' ? htmlspecialchars_decode($p['content'],ENT_COMPAT) : '"# New page\n"'); // Render the Markdown-formatted page content in HTML - require_once('library/markdown.php'); - $html = wiki_generate_toc(purify_html(Markdown(json_decode($content)))); + require_once('library/markdown.php'); + $html = wiki_generate_toc(purify_html(Markdown(wiki_bbcode(json_decode($content))))); $renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName); $hide_editor = false; $showPageControls = $wiki_editor; diff --git a/include/wiki.php b/include/wiki.php index 494ff835e..d52308b08 100644 --- a/include/wiki.php +++ b/include/wiki.php @@ -495,6 +495,12 @@ function wiki_convert_links($s, $wikiURL) { return $s; } +/** + * Replace the instances of the string [toc] with a list element that will be populated by + * a table of contents by the JavaScript library + * @param string $s + * @return string + */ function wiki_generate_toc($s) { if (strpos($s,'[toc]') !== false) { |