aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Channel.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2019-03-19 09:05:27 +1100
committerMike Macgirvin <mike@macgirvin.com>2019-03-19 09:05:27 +1100
commit6a918dbde9b89980e952dd5fe09286de184aa760 (patch)
treed7bf4ea30d0204e508b924d904e2916bc5431705 /Zotlabs/Module/Channel.php
parent026b96b8f2aebff50f594aa2a184a60a66cc3fd4 (diff)
parentd486b030896d1b4d798dc3ea1806e492cdd4983a (diff)
downloadvolse-hubzilla-6a918dbde9b89980e952dd5fe09286de184aa760.tar.gz
volse-hubzilla-6a918dbde9b89980e952dd5fe09286de184aa760.tar.bz2
volse-hubzilla-6a918dbde9b89980e952dd5fe09286de184aa760.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Channel.php')
-rw-r--r--Zotlabs/Module/Channel.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 5fdefd805..d4ef94e06 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -414,12 +414,12 @@ class Channel extends Controller {
'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
'$search' => $search,
'$xchan' => '',
- '$order' => $order,
+ '$order' => (($order) ? urlencode($order) : ''),
'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
'$file' => '',
'$cats' => (($category) ? urlencode($category) : ''),
'$tags' => (($hashtags) ? urlencode($hashtags) : ''),
- '$mid' => $mid,
+ '$mid' => (($mid) ? urlencode($mid) : ''),
'$verb' => '',
'$net' => '',
'$dend' => $datequery,