aboutsummaryrefslogtreecommitdiffstats
path: root/mod/ping.php
diff options
context:
space:
mode:
authorTobias Hößl <tobias@hoessl.eu>2012-03-09 10:00:12 +0000
committerTobias Hößl <tobias@hoessl.eu>2012-03-09 10:00:12 +0000
commit635958e11da2f5a0d587b66968453064c2d41f13 (patch)
tree9e9b21d45551772a4aac8a54e3bafa382681ed70 /mod/ping.php
parent02a9fd5dc1d1d9e848e2f406f2e13c4cf0ce228b (diff)
parent2ce78253aeda8672e12f18f0963f52cd4a35e546 (diff)
downloadvolse-hubzilla-635958e11da2f5a0d587b66968453064c2d41f13.tar.gz
volse-hubzilla-635958e11da2f5a0d587b66968453064c2d41f13.tar.bz2
volse-hubzilla-635958e11da2f5a0d587b66968453064c2d41f13.zip
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'mod/ping.php')
-rw-r--r--mod/ping.php23
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();