diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-09-29 18:38:19 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-09-29 18:38:19 +0200 |
| commit | cc9ca8bbffaceb7273b4999e538a3d211ae3cf09 (patch) | |
| tree | d745cae08c7469d09b1d367200c4a30277500ef0 /Zotlabs | |
| parent | 5906d6cce373df81458bf16d461bee9705fed3a6 (diff) | |
| download | volse-hubzilla-cc9ca8bbffaceb7273b4999e538a3d211ae3cf09.tar.gz volse-hubzilla-cc9ca8bbffaceb7273b4999e538a3d211ae3cf09.tar.bz2 volse-hubzilla-cc9ca8bbffaceb7273b4999e538a3d211ae3cf09.zip | |
do not unset $_GET[search] and adjust activity_order widget
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Network.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Activity_order.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 73f09f90b..21507752d 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -86,7 +86,7 @@ class Network extends \Zotlabs\Web\Controller { if($search) { if(strpos($search,'#') === 0) { $hashtags = substr($search,1); - $search = $_GET['search'] = ''; + $search = ''; } } diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php index 2dceee70e..d9dbcc91f 100644 --- a/Zotlabs/Widget/Activity_order.php +++ b/Zotlabs/Widget/Activity_order.php @@ -55,7 +55,7 @@ class Activity_order { } // override order for search, filer and cid results - if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid'))) { + if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat')) { $unthreaded_active = 'active'; $commentord_active = $postord_active = 'disabled'; } |