harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not unset $_GET[search] and adjust activity_order widget

Browse Source
This commit is contained in:
Mario Vavti 2018-09-29 18:38:19 +02:00
parent 5906d6cce3
commit cc9ca8bbff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Network.php
View File

@ -86,7 +86,7 @@ class Network extends \Zotlabs\Web\Controller {
if($search) { if($search) {
if(strpos($search,'#') === 0) { if(strpos($search,'#') === 0) {
$hashtags = substr($search,1); $hashtags = substr($search,1);
$search = $_GET['search'] = ''; $search = '';
} }
} }

2
Zotlabs/Widget/Activity_order.php
View File

@ -55,7 +55,7 @@ class Activity_order {
} }
// override order for search, filer and cid results // 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'; $unthreaded_active = 'active';
$commentord_active = $postord_active = 'disabled'; $commentord_active = $postord_active = 'disabled';
} }