aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Widget/Activity_order.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-29 07:43:40 +0100
committerMario Vavti <mario@mariovavti.com>2018-10-29 07:43:40 +0100
commite1df69dfcb09d28635db995a147329453be6c4bf (patch)
tree8da7b9fdad15ae4ba3783e453533f47c5bb5e241 /Zotlabs/Widget/Activity_order.php
parent3de055bf65582e68e1d48658dde256d6031ab436 (diff)
parent3d9b1fd343b57573a29bf7e65d0055eb1d92398d (diff)
downloadvolse-hubzilla-e1df69dfcb09d28635db995a147329453be6c4bf.tar.gz
volse-hubzilla-e1df69dfcb09d28635db995a147329453be6c4bf.tar.bz2
volse-hubzilla-e1df69dfcb09d28635db995a147329453be6c4bf.zip
Merge branch 'dev'
Diffstat (limited to 'Zotlabs/Widget/Activity_order.php')
-rw-r--r--Zotlabs/Widget/Activity_order.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php
index 1cba1ce8c..d3fe2a30f 100644
--- a/Zotlabs/Widget/Activity_order.php
+++ b/Zotlabs/Widget/Activity_order.php
@@ -54,8 +54,8 @@ class Activity_order {
}
}
- // override order for search, filer and cid results
- if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat')) {
+ // override order for some filter results
+ if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat') || x($_GET,'conv') || x($_GET,'unseen')) {
$unthreaded_active = 'active';
$commentord_active = $postord_active = 'disabled';
}