clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Profile data in gcontact overwrites profile data

This commit is contained in:
Michael Vogel 2016-01-08 08:02:42 +01:00
parent 358a9fd6fd
commit 6703ba468a
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mod/display.php
View File

@ -180,21 +180,24 @@ function display_fetchauthor($a, $item) {
} }
// Fetching profile data from global contacts // Fetching profile data from global contacts
// @todo: should override everything else (but not Feeds) if ($profiledata["network"] != NETWORK_FEED) {
$r = q("SELECT `photo`, `nick`, `addr`, `location`, `about`, `gender` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profiledata["url"]))); $r = q("SELECT `photo`, `nick`, `addr`, `location`, `about`, `gender` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profiledata["url"])));
if (count($r)) { if (count($r)) {
if ($profiledata["photo"] == "") if ($r[0]["avatar"] != "")
$profiledata["photo"] = $r[0]["avatar"]; $profiledata["photo"] = $r[0]["avatar"];
if (($profiledata["address"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA)) if (($r[0]["location"] != "") AND ($profiledata["network"] != NETWORK_DIASPORA))
$profiledata["address"] = $r[0]["location"]; $profiledata["address"] = $r[0]["location"];
if (($profiledata["about"] == "") AND ($profiledata["network"] != NETWORK_DIASPORA)) if (($r[0]["about"] != "") AND ($profiledata["network"] != NETWORK_DIASPORA))
$profiledata["about"] = $r[0]["about"]; $profiledata["about"] = $r[0]["about"];
if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != "")) if (($r[0]["nick"] != "") AND ($r[0]["nick"] != ""))
$profiledata["nickname"] = $r[0]["nick"]; $profiledata["nickname"] = $r[0]["nick"];
if ($profiledata["gender"] == "") if ($r[0]["gender"] != "")
$profiledata["gender"] = $r[0]["gender"]; $profiledata["gender"] = $r[0]["gender"];
if ($profiledata["addr"] == "") if ($r[0]["addr"] != "")
$profiledata["addr"] = $r[0]["addr"]; $profiledata["addr"] = $r[0]["addr"];
if ($r[0]["keywords"] != "")
$profiledata["keywords"] = $r[0]["keywords"];
}
} }
if (local_user()) { if (local_user()) {