Bugfix: In threads the contact data from users weren't taken.

diff --git a/include/Contact.php b/include/Contact.php
index 6297cdbe746d2183aa398aebaeed96c9f379fa5e..cbce6cf540c13c72055f79659a2b7f6d1d8c9684 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -214,21 +214,21 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
                        dbesc(normalise_link($url)), intval($uid), dbesc($profile["network"]));
 
        // Is the contact present for the user in a different network? (Can happen with OStatus and the "Statusnet" addon)
-       if (!count($r) AND !isset($profile))
+       if (!$r)
                $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
                                `keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
                        FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
                                dbesc(normalise_link($url)), intval($uid));
 
        // Fetch the data from the contact table with "uid=0" (which is filled automatically)
-       if (!count($r) AND !isset($profile))
+       if (!$r)
                $r = q("SELECT `id`, 0 AS `cid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
                                `keywords`, `gender`, `photo`, `thumb`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self`
                        FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
                                dbesc(normalise_link($url)));
 
        // Fetch the data from the gcontact table
-       if (!count($r) AND !isset($profile))
+       if (!$r)
                $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
                                `keywords`, `gender`, `photo`, `photo` AS `thumb`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self`
                        FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",

diff --git a/object/Item.php b/object/Item.php
index a907ff228a141574f1bfc6b2dfe5e6f47c8342a1..ad3da470144cfbd6a310f7ce1a17f8fd788d20d9 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -151,7 +151,7 @@ class Item extends BaseObject {
                        $profile_link = zrl($profile_link);
 
                // Don't rely on the author-avatar. It is better to use the data from the contact table
-               $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
+               $author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner());
                if ($author_contact["thumb"])
                        $profile_avatar = $author_contact["thumb"];
                else