diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-11-30 15:13:06 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-11-30 15:13:06 +0100 |
| commit | 1fe1194ef42026b70e62a678133d025dd0553756 (patch) | |
| tree | 6684099118551fef19223b4d4da3d3f9dc030296 /Zotlabs | |
| parent | 19d091945171b07a9037ae538ce341faf2680bde (diff) | |
| download | volse-hubzilla-1fe1194ef42026b70e62a678133d025dd0553756.tar.gz volse-hubzilla-1fe1194ef42026b70e62a678133d025dd0553756.tar.bz2 volse-hubzilla-1fe1194ef42026b70e62a678133d025dd0553756.zip | |
do not call purify_html() at this place
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index c4cc72ae8..5cf62d2fb 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -38,6 +38,7 @@ class Wiki extends \Zotlabs\Web\Controller { require_once('include/wiki.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); + require_once('include/bbcode.php'); // TODO: Combine the interface configuration into a unified object // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) @@ -209,7 +210,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 = purify_html(bbcode($content)); + $renderedContent = bbcode($content); } else { require_once('library/markdown.php'); @@ -287,6 +288,7 @@ class Wiki extends \Zotlabs\Web\Controller { function post() { require_once('include/wiki.php'); + require_once('include/bbcode.php'); $nick = argv(1); $owner = channelx_by_nick($nick); @@ -309,7 +311,7 @@ class Wiki extends \Zotlabs\Web\Controller { $mimeType = $w['mimeType']; if($mimeType == 'text/bbcode') { - $html = purify_html(bbcode($content)); + $html = bbcode($content); } else { require_once('library/markdown.php'); |