diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-20 19:41:03 -0700 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-29 14:03:24 +0200 |
| commit | e97dd48b4c046bac86322d91a13fd55d0cf3a99f (patch) | |
| tree | 65a24525ccc3d86baf39ba42f4592eeffe09da31 /Zotlabs | |
| parent | 5915f31950a7b2314a6718854b7808475d394b44 (diff) | |
| download | volse-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
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/MarkdownSoap.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 1 |
3 files changed, 3 insertions, 2 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",' ',$s); $s = str_replace(' ',' ',$s); $s = purify_html($s); - $s = str_replace(' '," ",$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/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( |