diff options
author | Michael <icarus@dabo.de> | 2012-03-02 10:34:18 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-03-02 10:34:18 +0100 |
commit | 20817b4b8ea8b7d074d57a3fd752862931cf711c (patch) | |
tree | fd0344bd209043c4d8191ef68dceb1499cf7dd9a /mod/ping.php | |
parent | 52ea842e872cc004fd012496c828e9fb6186bec9 (diff) | |
parent | f1bf6dcdfb89bf3c21e498ba3d76c600dafed934 (diff) | |
download | volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.gz volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.tar.bz2 volse-hubzilla-20817b4b8ea8b7d074d57a3fd752862931cf711c.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/ping.php')
-rw-r--r-- | mod/ping.php | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/mod/ping.php b/mod/ping.php index 7380ff7d0..1562254b1 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -14,10 +14,29 @@ function ping_init(&$a) { $firehose = intval(get_pconfig(local_user(),'system','notify_full')); - $z = q("select * from notify where uid = %d - order by seen asc, date desc limit 0, 50", + $t = q("select count(*) as total from notify where uid = %d and seen = 0", intval(local_user()) ); + if($t && intval($t[0]['total']) > 49) { + $z = q("select * from notify where uid = %d + and seen = 0 order by date desc limit 0, 50", + intval(local_user()) + ); + } + else { + $z1 = q("select * from notify where uid = %d + and seen = 0 order by date desc limit 0, 50", + intval(local_user()) + ); + + $z2 = q("select * from notify where uid = %d + and seen = 1 order by date desc limit 0, %d", + intval(local_user()), + intval(50 - intval($t[0]['total'])) + ); + $z = array_merge($z1,$z2); + } + $tags = array(); |