aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Widget/Activity_order.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-31 13:05:32 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-31 13:05:32 +0200
commitcbaaa1c57ffed0b0a11a7d4cf9a492c26e577194 (patch)
tree020b83c4ce7c0fd6a3d59941c5a989d7ff846385 /Zotlabs/Widget/Activity_order.php
parent6bfc5aa96c44d3a16962242d0ef02ccfa879ab7b (diff)
downloadvolse-hubzilla-cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194.tar.gz
volse-hubzilla-cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194.tar.bz2
volse-hubzilla-cbaaa1c57ffed0b0a11a7d4cf9a492c26e577194.zip
merge groups and filed posts into activity filters
Diffstat (limited to 'Zotlabs/Widget/Activity_order.php')
-rw-r--r--Zotlabs/Widget/Activity_order.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php
index edeef2c20..c973e3809 100644
--- a/Zotlabs/Widget/Activity_order.php
+++ b/Zotlabs/Widget/Activity_order.php
@@ -56,7 +56,7 @@ class Activity_order {
// override order for search results and filer results
if(x($_GET,'search') || x($_GET,'file')) {
$unthreaded_active = 'active';
- $commentord_active = $postord_active = '';
+ $commentord_active = $postord_active = 'disabled';
}
$cmd = \App::$cmd;
@@ -75,6 +75,9 @@ class Activity_order {
if(x($_GET,'conv'))
$filter .= '&conv=' . $_GET['conv'];
+ if(x($_GET,'file'))
+ $filter .= '&file=' . $_GET['file'];
+
// tabs
$tabs = [];