From e25ded6d9611e4bada5474b7c7d7c96ad95c930e Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 31 May 2011 17:35:24 -0700 Subject: [PATCH] don't count wall posts in unseen network total --- boot.php | 2 +- mod/ping.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index a829daf9c..f42d6beda 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.996' ); +define ( 'FRIENDIKA_VERSION', '2.2.997' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1059 ); diff --git a/mod/ping.php b/mod/ping.php index b736ea995..6e8618bbd 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -8,7 +8,7 @@ function ping_init(&$a) { xml_status(0); $r = q("SELECT COUNT(*) AS `total` FROM `item` - WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d", + WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ", intval(local_user()) ); $network = $r[0]['total']; @@ -25,8 +25,7 @@ function ping_init(&$a) { ); $intro = $r[0]['total']; - if ($a->config['register_policy'] == REGISTER_APPROVE && - $a->config['admin_email'] === $a->user['email']){ + if (($a->config['register_policy'] == REGISTER_APPROVE) && (is_site_admin())) { $r = q("SELECT COUNT(*) AS `total` FROM `register`"); $register = $r[0]['total']; } else {