friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Added description

This commit is contained in:
Michael Vogel 2016-04-20 07:26:18 +02:00
parent 28f97845ca
commit bc0ba8a0d7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/socgraph.php
View File

@ -1377,12 +1377,19 @@ function clean_contact_url($url) {
return $new_url; return $new_url;
} }
/**
* @brief Replace alternate OStatus user format with the primary one
*
* @param arr $contact contact array (called by reference)
*/
function fix_alternate_contact_address(&$contact) { function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) { if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) {
$data = probe_url($contact["url"]); $data = probe_url($contact["url"]);
if (!in_array($contact["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) { if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"], LOGGER_DEBUG);
$contact["url"] = $data["url"]; $contact["url"] = $data["url"];
$contact["addr"] = $data["addr"]; $contact["addr"] = $data["addr"];
$contact["alias"] = $data["alias"];
$contact["server_url"] = $data["baseurl"]; $contact["server_url"] = $data["baseurl"];
} }
} }