aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-02-23 15:15:19 -0800
committerzotlabs <mike@macgirvin.com>2017-02-23 15:15:19 -0800
commit96fdb88690fcb572b5bc4948a7df71b3c257a97d (patch)
tree06aa37c9748c8c8d32427ca7b04b790bb7b6432c
parent3e992604c711b64232075215e2fec734f7084377 (diff)
downloadvolse-hubzilla-96fdb88690fcb572b5bc4948a7df71b3c257a97d.tar.gz
volse-hubzilla-96fdb88690fcb572b5bc4948a7df71b3c257a97d.tar.bz2
volse-hubzilla-96fdb88690fcb572b5bc4948a7df71b3c257a97d.zip
nativewiki: only apply markdown filter to markdown input
-rw-r--r--Zotlabs/Lib/NativeWikiPage.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index cdb2a5134..af0286997 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -333,18 +333,26 @@ class NativeWikiPage {
static public function save_page($arr) {
- $pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
- $content = ((array_key_exists('content',$arr)) ? purify_html(Zlib\NativeWikiPage::prepare_content($arr['content'])) : '');
- $resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
+ $pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
+ $content = ((array_key_exists('content',$arr)) ? $arr['content'] : '');
+ $resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
$channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0);
- $revision = ((array_key_exists('revision',$arr)) ? $arr['revision'] : 0);
+ $revision = ((array_key_exists('revision',$arr)) ? $arr['revision'] : 0);
$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
if (!$w['wiki']) {
return array('message' => t('Error reading wiki'), 'success' => false);
}
+
+ $mimetype = $w['mimeType'];
+ if($mimetype === 'text/markdown') {
+ $content = purify_html(Zlib\NativeWikiPage::prepare_content($content));
+ }
+ else {
+ $content = escape_tags($content);
+ }
// fetch the most recently saved revision.