diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-05 12:13:50 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-05 12:13:50 +0200 |
| commit | 53a2262fef2c1e6208a301a15c0e0c9a024b2b42 (patch) | |
| tree | a0a652072c3aa2da633a78e56d0284c9d81988ed /Zotlabs | |
| parent | 7e5428c69703e16f011e362a9865fe50d4841ddb (diff) | |
| parent | 709206accde6136f96f1484510edc4b61b3d52a7 (diff) | |
| download | volse-hubzilla-53a2262fef2c1e6208a301a15c0e0c9a024b2b42.tar.gz volse-hubzilla-53a2262fef2c1e6208a301a15c0e0c9a024b2b42.tar.bz2 volse-hubzilla-53a2262fef2c1e6208a301a15c0e0c9a024b2b42.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
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 011cd4366..bb4e9179c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -147,8 +147,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; @@ -230,6 +230,7 @@ class Wiki extends \Zotlabs\Web\Controller { $content = $_POST['content']; $resource_id = $_POST['resource_id']; require_once('library/markdown.php'); + $content = wiki_bbcode($content); $html = wiki_generate_toc(purify_html(Markdown($content))); $w = wiki_get_wiki($resource_id); $wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName']; |