aboutsummaryrefslogtreecommitdiffstats
path: root/mod/ping.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-01 07:56:27 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-01 07:56:27 +0200
commit2413a6b422d5c49024d9c2c9cff79cbc82ba3a56 (patch)
treec531676a196ad7defdeefd56ea2519afd4c61a44 /mod/ping.php
parent745d075397941e0a84d017342bb9c4c4a4c1ef5b (diff)
parentfc34641d4a69580a4e7fd5c3806c22d009d5d037 (diff)
downloadvolse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.tar.gz
volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.tar.bz2
volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/ping.php')
-rw-r--r--mod/ping.php5
1 files changed, 2 insertions, 3 deletions
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 {