aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-20 19:41:03 -0700
committerMario Vavti <mario@mariovavti.com>2017-03-29 14:03:24 +0200
commite97dd48b4c046bac86322d91a13fd55d0cf3a99f (patch)
tree65a24525ccc3d86baf39ba42f4592eeffe09da31
parent5915f31950a7b2314a6718854b7808475d394b44 (diff)
downloadvolse-hubzilla-e97dd48b4c046bac86322d91a13fd55d0cf3a99f.tar.gz
volse-hubzilla-e97dd48b4c046bac86322d91a13fd55d0cf3a99f.tar.bz2
volse-hubzilla-e97dd48b4c046bac86322d91a13fd55d0cf3a99f.zip
even more fine tuning of the markdown purifier - especially when used with the wiki
-rw-r--r--Zotlabs/Lib/MarkdownSoap.php2
-rw-r--r--Zotlabs/Lib/NativeWikiPage.php2
-rw-r--r--Zotlabs/Module/Wiki.php1
-rw-r--r--view/tpl/wiki.tpl2
4 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index 8cc18d513..cf1446f45 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -81,7 +81,7 @@ class MarkdownSoap {
$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
$s = str_replace(' ','&nbsp;',$s);
$s = purify_html($s);
- $s = str_replace('&nbsp;'," ",$s);
+ $s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
$s = str_replace(['<br>','<br />'],["\n","\n"],$s);
return $s;
}
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 3d6da7779..960fe014e 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -156,7 +156,7 @@ class NativeWikiPage {
$content = $item['body'];
return [
- 'content' => json_encode($content),
+ 'content' => $content,
'mimeType' => $w['mimeType'],
'message' => '',
'success' => true
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 4234ba3fd..9adef1795 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -256,6 +256,7 @@ class Wiki extends \Zotlabs\Web\Controller {
goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName);
}
+
$wikiModalID = random_string(3);
$wikiModal = replace_macros(get_markup_template('generic_modal.tpl'), array(
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 87c649581..452fd429d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -104,7 +104,7 @@
window.wiki_resource_id = '{{$resource_id}}';
window.wiki_page_name = '{{$page}}';
// window.wiki_page_content = "{{$content|escape:'javascript'}}";
- window.wiki_page_content = {{$content}};
+ window.wiki_page_content = '{{$content|escape:'quotes'}}';
window.wiki_page_commit = '{{$commit}}';
$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');