aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorM.Dent <dentm42@dm42.net>2018-10-08 13:22:39 -0400
committerM.Dent <dentm42@dm42.net>2018-10-08 13:35:18 -0400
commit709665846e66f093109730691b31d9e094d02088 (patch)
tree40d17410f9f69751aa4a3d0a382d94bd76d583ba /Zotlabs/Lib
parent93a310582f044d35f0a3583671053595fefdbedb (diff)
downloadvolse-hubzilla-709665846e66f093109730691b31d9e094d02088.tar.gz
volse-hubzilla-709665846e66f093109730691b31d9e094d02088.tar.bz2
volse-hubzilla-709665846e66f093109730691b31d9e094d02088.zip
Rework Wiki encoding scheme.
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/NativeWiki.php1
-rw-r--r--Zotlabs/Lib/NativeWikiPage.php3
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;