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

server_url was forgotten

This commit is contained in:
Michael 2017-03-23 06:45:00 +00:00
parent 9e5bec1bc8
commit 26ec56dfa5
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/discover_poco.php
View File

@ -236,6 +236,9 @@ function discover_directory($search) {
if ($jj->tags != "") { if ($jj->tags != "") {
$data["keywords"] = $jj->tags; $data["keywords"] = $jj->tags;
} }
$data["server_url"] = $data["baseurl"];
update_gcontact($data); update_gcontact($data);
} else { } else {
logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG); logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);

32
include/socgraph.php
View File

@ -290,16 +290,6 @@ function sanitized_gcontact(&$gcontact) {
$gcontact["server_url"] = $data["baseurl"]; $gcontact["server_url"] = $data["baseurl"];
unset($data["guid"]);
unset($data["batch"]);
unset($data["poll"]);
unset($data["request"]);
unset($data["confirm"]);
unset($data["poco"]);
unset($data["priority"]);
unset($data["pubkey"]);
unset($data["baseurl"]);
$gcontact = array_merge($gcontact, $data); $gcontact = array_merge($gcontact, $data);
if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) { if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) {
@ -608,15 +598,7 @@ function poco_last_updated($profile, $force = false) {
$gcontact = array_merge($gcontacts[0], $data); $gcontact = array_merge($gcontacts[0], $data);
unset($gcontact["guid"]); $gcontact["server_url"] = $data["baseurl"];
unset($gcontact["batch"]);
unset($gcontact["poll"]);
unset($gcontact["request"]);
unset($gcontact["confirm"]);
unset($gcontact["poco"]);
unset($gcontact["priority"]);
unset($gcontact["pubkey"]);
unset($gcontact["baseurl"]);
if (sanitized_gcontact($gcontact)) { if (sanitized_gcontact($gcontact)) {
update_gcontact($gcontact); update_gcontact($gcontact);
@ -642,16 +624,6 @@ function poco_last_updated($profile, $force = false) {
$contact["server_url"] = $data["baseurl"]; $contact["server_url"] = $data["baseurl"];
unset($contact["guid"]);
unset($contact["batch"]);
unset($contact["poll"]);
unset($contact["request"]);
unset($contact["confirm"]);
unset($contact["poco"]);
unset($contact["priority"]);
unset($contact["pubkey"]);
unset($contact["baseurl"]);
update_gcontact($contact); update_gcontact($contact);
$feedret = z_fetch_url($data["poll"]); $feedret = z_fetch_url($data["poll"]);
@ -2208,6 +2180,8 @@ function update_gcontact_from_probe($url) {
return; return;
} }
$data["server_url"] = $data["baseurl"];
update_gcontact($data); update_gcontact($data);
} }