aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-12-10 04:24:04 +0000
committerMario <mario@mariovavti.com>2018-12-14 11:30:25 +0100
commit989605754948ad8b8d0f0642d1c3ba155a0b362a (patch)
tree141f0320f032fd20f631ec6d8326b2c76856ad2e
parent44832bbacb90cabe1d31ba425b44998667f63936 (diff)
downloadvolse-hubzilla-989605754948ad8b8d0f0642d1c3ba155a0b362a.tar.gz
volse-hubzilla-989605754948ad8b8d0f0642d1c3ba155a0b362a.tar.bz2
volse-hubzilla-989605754948ad8b8d0f0642d1c3ba155a0b362a.zip
home notifications won't expand if there are more than 300 unseen network notifications ahead of them.
(cherry picked from commit 30efeb5becb2b5e1133f429460c5c3bbc9b44f55)
-rw-r--r--Zotlabs/Module/Ping.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 12244d88c..a367b1062 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -347,6 +347,10 @@ class Ping extends \Zotlabs\Web\Controller {
if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) {
$result = array();
+ if(argv(1) === 'home') {
+ $sql_extra .= ' and item_wall = 1 ';
+ }
+
$r = q("SELECT * FROM item
WHERE uid = %d
AND item_unseen = 1
@@ -362,8 +366,6 @@ class Ping extends \Zotlabs\Web\Controller {
if($r) {
xchan_query($r);
foreach($r as $item) {
- if((argv(1) === 'home') && (! intval($item['item_wall'])))
- continue;
$result[] = \Zotlabs\Lib\Enotify::format($item);
}
}