Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 7e20b9383d6788cb68bf8c6a08c060a87ee46f36..1bbddbe5c359666889388f5f64b3506e183f9de6 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -175,7 +175,7 @@ function ping_init(App $a)
                );
 
                $intro_count = count($intros1) + count($intros2);
-               $intros = $intros1+$intros2;
+               $intros = $intros1 + $intros2;
 
                $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
                $mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
@@ -189,7 +189,10 @@ function ping_init(App $a)
                        $regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
                                FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
                                WHERE `contact`.`self` = 1");
-                       if ($regs) {
+
+                       $register_count = 0;
+
+                       if (dbm::is_result($regs)) {
                                $register_count = $regs[0]['total'];
                        }
                }