harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not call purify_html() at this place

Browse Source
This commit is contained in:
Mario Vavti 2016-11-30 15:13:06 +01:00
parent 19d0919451
commit 1fe1194ef4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Wiki.php
View File

@ -38,6 +38,7 @@ class Wiki extends \Zotlabs\Web\Controller {
require_once('include/wiki.php'); require_once('include/wiki.php');
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/bbcode.php');
// TODO: Combine the interface configuration into a unified object // TODO: Combine the interface configuration into a unified object
// Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) // 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"'); $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"');
// Render the Markdown-formatted page content in HTML // Render the Markdown-formatted page content in HTML
if($mimeType == 'text/bbcode') { if($mimeType == 'text/bbcode') {
$renderedContent = purify_html(bbcode($content)); $renderedContent = bbcode($content);
} }
else { else {
require_once('library/markdown.php'); require_once('library/markdown.php');
@ -287,6 +288,7 @@ class Wiki extends \Zotlabs\Web\Controller {
function post() { function post() {
require_once('include/wiki.php'); require_once('include/wiki.php');
require_once('include/bbcode.php');
$nick = argv(1); $nick = argv(1);
$owner = channelx_by_nick($nick); $owner = channelx_by_nick($nick);
@ -309,7 +311,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$mimeType = $w['mimeType']; $mimeType = $w['mimeType'];
if($mimeType == 'text/bbcode') { if($mimeType == 'text/bbcode') {
$html = purify_html(bbcode($content)); $html = bbcode($content);
} }
else { else {
require_once('library/markdown.php'); require_once('library/markdown.php');