aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Widget/Wiki_pages.php
diff options
context:
space:
mode:
authorM.Dent <dentm42@dm42.net>2018-10-08 17:22:39 +0000
committerMario <mario@mariovavti.com>2018-10-10 11:05:34 +0200
commitd8f79f48e9b4859383eaeea35da6d32045f55ae1 (patch)
treeeaea8974c1d2b71f486a31334ef1b160bffae58b /Zotlabs/Widget/Wiki_pages.php
parentbf878dc4461ea28f71055d59496b21a1685ef63e (diff)
downloadvolse-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/Widget/Wiki_pages.php')
-rw-r--r--Zotlabs/Widget/Wiki_pages.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index 831662ca9..dee0a2229 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -11,7 +11,7 @@ class Wiki_pages {
return;
$c = channelx_by_nick(argv(1));
- $w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],urldecode(argv(2)));
+ $w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],NativeWiki::name_decode(argv(2)));
$arr = array(
'resource_id' => $w['resource_id'],
'channel_id' => $c['channel_id'],
@@ -24,6 +24,7 @@ class Wiki_pages {
$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
$pageName = NativeWiki::name_decode(escape_tags(argv(3)));
+ $wikiname = $w['urlName'];
return replace_macros(get_markup_template('wiki_page_not_found.tpl'), array(
'$resource_id' => $arr['resource_id'],
'$channel_address' => $arr['channel_address'],
@@ -49,7 +50,7 @@ class Wiki_pages {
if(! $arr['resource_id']) {
$c = channelx_by_nick(argv(1));
- $w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],urldecode(argv(2)));
+ $w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],NativeWiki::name_decode(argv(2)));
$arr = array(
'resource_id' => $w['resource_id'],
'channel_id' => $c['channel_id'],