don't count wall posts in unseen network total

This commit is contained in:
Friendika 2011-05-31 17:35:24 -07:00
parent 1d2cc5c5ad
commit e25ded6d96
2 changed files with 3 additions and 4 deletions

View file

@ -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 );

View file

@ -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 {