diff options
| author | M.Dent <dentm42@dm42.net> | 2018-10-08 17:22:39 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-10 11:05:34 +0200 |
| commit | d8f79f48e9b4859383eaeea35da6d32045f55ae1 (patch) | |
| tree | eaea8974c1d2b71f486a31334ef1b160bffae58b /Zotlabs/Lib | |
| parent | bf878dc4461ea28f71055d59496b21a1685ef63e (diff) | |
| download | volse-hubzilla-d8f79f48e9b4859383eaeea35da6d32045f55ae1.tar.gz volse-hubzilla-d8f79f48e9b4859383eaeea35da6d32045f55ae1.tar.bz2 volse-hubzilla-d8f79f48e9b4859383eaeea35da6d32045f55ae1.zip | |
Rework Wiki encoding scheme.
(cherry picked from commit 709665846e66f093109730691b31d9e094d02088)
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 4309d3f6e..65f40748c 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -292,6 +292,7 @@ class NativeWiki { public static function name_encode ($string) { + $string = html_entity_decode($string); $encoding = mb_internal_encoding(); mb_internal_encoding("UTF-8"); $ret = mb_ereg_replace_callback ('[^A-Za-z0-9\-\_\.\~]',function ($char) { diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index d0f522ec1..ebdcb4740 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -100,7 +100,7 @@ class NativeWikiPage { 'rawName' => $name, 'htmlName' => escape_tags($name), //'urlName' => urlencode($name), - Zlib\NativeWiki::name_encode($name) + 'urlName' => Zlib\NativeWiki::name_encode($name) ]; @@ -368,7 +368,6 @@ class NativeWikiPage { unset($item['id']); unset($item['author']); - $item['parent'] = 0; $item['body'] = $content; $item['author_xchan'] = $observer_hash; |