Merge pull request #10899 from annando/profile-photo

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 1b4cfb3332a8c29151b3d866bfe50834aa9b8d5b..2143f73af283181f4bb09f5c7dc4bf1edec9df0a 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -177,16 +177,16 @@ function ping_init(App $a)
 
                $intros1 = DBA::toArray(DBA::p(
                        "SELECT  `intro`.`id`, `intro`.`datetime`,
-                       `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
-                       FROM `intro` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
+                       `contact`.`name`, `contact`.`url`, `contact`.`photo`
+                       FROM `intro` INNER JOIN `contact` ON `intro`.`suggest-cid` = `contact`.`id`
+                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`suggest-cid` != 0",
                        local_user()
                ));
                $intros2 = DBA::toArray(DBA::p(
                        "SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
                        FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
+                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`suggest-cid` = 0 OR `intro`.`suggest-cid` IS NULL)",
                        local_user()
                ));