don't count wall posts in unseen network total

diff --git a/boot.php b/boot.php
index a829daf9c19c5d8261c572f674c42b3444778835..f42d6beda2001357e1c3ad65a39bde8d240efe0e 100644 (file)
--- 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 b736ea995c18c9b35ea976c1b60368e31a06925f..6e8618bbdcc5424c5e110c4f40955824b24d898e 100644 (file)
--- 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 {