diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-21 00:40:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-21 00:40:19 -0700 |
| commit | 82631c3413b7fc7025f46cd23c17d3ea292cf16c (patch) | |
| tree | 39f82e43f8f948c7f12e9ed3c13fd24c58936cb7 | |
| parent | b153c651b45842b0062c0b32a1a3816a1f06856c (diff) | |
| download | volse-hubzilla-82631c3413b7fc7025f46cd23c17d3ea292cf16c.tar.gz volse-hubzilla-82631c3413b7fc7025f46cd23c17d3ea292cf16c.tar.bz2 volse-hubzilla-82631c3413b7fc7025f46cd23c17d3ea292cf16c.zip | |
more markdown purification
| -rw-r--r-- | Zotlabs/Lib/MarkdownSoap.php | 10 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php index e5f3c81dd..a0214bbe4 100644 --- a/Zotlabs/Lib/MarkdownSoap.php +++ b/Zotlabs/Lib/MarkdownSoap.php @@ -77,12 +77,12 @@ class MarkdownSoap { } function purify($s) { - $s = str_replace("\n",'<br>',$s); - $s = str_replace("\t",' ',$s); - $s = str_replace(' ',' ',$s); +// $s = str_replace("\n",'<br>',$s); +// $s = str_replace("\t",' ',$s); +// $s = str_replace(' ',' ',$s); $s = purify_html($s); - $s = str_replace([' ', mb_convert_encoding(' ','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s); - $s = str_replace(['<br>','<br />', '<', '>' ],["\n","\n", '<', '>'],$s); +// $s = str_replace([' ', mb_convert_encoding(' ','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s); +// $s = str_replace(['<br>','<br />', '<', '>' ],["\n","\n", '<', '>'],$s); return $s; } diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 2865adec2..c831ab33d 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -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'); |