diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-10 08:39:28 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-10 11:06:39 +0200 |
| commit | c7644ad29dfdfd237125d3c8815ae62b8457b80a (patch) | |
| tree | 5d2caddd4abb374897c9e3a0a138f795b8d75e56 /Zotlabs | |
| parent | 0daa462207c0fdb88c091b07de020d1facc5430d (diff) | |
| download | volse-hubzilla-c7644ad29dfdfd237125d3c8815ae62b8457b80a.tar.gz volse-hubzilla-c7644ad29dfdfd237125d3c8815ae62b8457b80a.tar.bz2 volse-hubzilla-c7644ad29dfdfd237125d3c8815ae62b8457b80a.zip | |
fix some more wiki issues
(cherry picked from commit d29caa099af2d132978e634a454a29d5c85c23fe)
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 65f40748c..cdabbc3e9 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -252,7 +252,7 @@ class NativeWiki { AND item_deleted = 0 $sql_extra limit 1", dbesc(NWIKI_ITEM_RESOURCE_TYPE), //dbesc(urldecode($urlName)), - dbesc($urlName), + dbesc(self::name_decode($urlName)), intval($uid) ); diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index ebdcb4740..8d21fac5e 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -157,7 +157,7 @@ class NativeWikiPage { 'rawName' => $pageNewName, 'htmlName' => escape_tags($pageNewName), //'urlName' => urlencode(escape_tags($pageNewName)) - Zlib\NativeWiki::name_encode($pageNewName) + 'urlName' => Zlib\NativeWiki::name_encode($pageNewName) ]; return [ 'success' => true, 'page' => $page ]; diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index ead7eea6a..25823da62 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -293,9 +293,9 @@ class Wiki extends Controller { } //$wikiheaderName = urldecode($wikiUrlName); - $wikiheaderName = $wikiUrlName; + $wikiheaderName = NativeWiki::name_decode($wikiUrlName); //$wikiheaderPage = urldecode($pageUrlName); - $wikiheaderPage = $pageUrlName; + $wikiheaderPage = NativeWiki::name_decode($pageUrlName); $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); $sharePage = t('Share'); @@ -812,7 +812,7 @@ class Wiki extends Controller { if ($pageUrlName === 'Home') { json_return_and_die(array('message' => 'Cannot rename Home','success' => false)); } - if(NativeWiki::encode_name(escape_tags($pageNewName)) === '') { + if(NativeWiki::name_encode(escape_tags($pageNewName)) === '') { json_return_and_die(array('message' => 'Error renaming page. Invalid name.', 'success' => false)); } // Determine if observer has permission to rename pages |