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

more markdown purification

Browse Source
This commit is contained in:
zotlabs 2017-03-21 00:40:19 -07:00
parent b153c651b4
commit 82631c3413
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Lib/MarkdownSoap.php
View File

@ -77,12 +77,12 @@ class MarkdownSoap {
}
function purify($s) {
$s = str_replace("\n",'<br>',$s);
$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
$s = str_replace(' ','&nbsp;',$s);
// $s = str_replace("\n",'<br>',$s);
// $s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
// $s = str_replace(' ','&nbsp;',$s);
$s = purify_html($s);
$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
$s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
// $s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
// $s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
return $s;
}

3
view/tpl/wiki.tpl
View File

@ -107,8 +107,7 @@
<script>
window.wiki_resource_id = '{{$resource_id}}';
window.wiki_page_name = '{{$page}}';
// window.wiki_page_content = "{{$content|escape:'javascript'}}";
window.wiki_page_content = '{{$content|escape:'quotes'}}';
window.wiki_page_content = '{{$content|escape:'javascript'}}';
window.wiki_page_commit = '{{$commit}}';
$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');