diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
commit | 7d23149a61f75923b2c71a288a722ee219f5e6ba (patch) | |
tree | dea64e1cfc15eb6f95e7440e532258dfb909c21c /mod/ping.php | |
parent | 59b45f7fc12027c387f04a2121ea398c1d534626 (diff) | |
parent | bb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff) | |
download | volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2 volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/ping.php')
-rw-r--r-- | mod/ping.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/ping.php b/mod/ping.php index 1562254b1..e911aaf1f 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -22,6 +22,7 @@ function ping_init(&$a) { and seen = 0 order by date desc limit 0, 50", intval(local_user()) ); + $sysnotify = $t[0]['total']; } else { $z1 = q("select * from notify where uid = %d @@ -35,6 +36,7 @@ function ping_init(&$a) { intval(50 - intval($t[0]['total'])) ); $z = array_merge($z1,$z2); + $sysnotify = 0; // we will update this in a moment } @@ -147,13 +149,12 @@ function ping_init(&$a) { $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); require_once('include/bbcode.php'); - $sysnotify = 0; if($firehose) { echo ' <notif count="'.$tot.'">'; } else { - if(count($z)) { + if(count($z) && (! $sysnotify)) { foreach($z as $zz) { if($zz['seen'] == 0) $sysnotify ++; |