- // Fetching profile data from unique contacts
- $r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", dbesc(normalise_link($profiledata["url"])));
- if (count($r)) {
- if ($profiledata["photo"] == "")
- $profiledata["photo"] = proxy_url($r[0]["avatar"], false, PROXY_SIZE_SMALL);
- if (($profiledata["address"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA))
- $profiledata["address"] = bbcode($r[0]["location"]);
- if (($profiledata["about"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA))
- $profiledata["about"] = bbcode($r[0]["about"]);
- if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != ""))
+ // Fetching profile data from global contacts
+ if ($profiledata["network"] != NETWORK_FEED) {
+ $r = q("SELECT `name`, `photo`, `nick`, `addr`, `location`, `about`, `gender`, `keywords`, `network` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profiledata["url"])));
+ if (count($r)) {
+ $profiledata["name"] = $r[0]["name"];
+ $profiledata["photo"] = $r[0]["photo"];