server_url was forgotten

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 5a0ca70a472c9321588684bbc292fa098589e454..4c52fdd3ef9b4a7031abdf9b2a297c313240db6d 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -236,6 +236,9 @@ function discover_directory($search) {
                                if ($jj->tags != "") {
                                        $data["keywords"] = $jj->tags;
                                }
+
+                               $data["server_url"] = $data["baseurl"];
+
                                update_gcontact($data);
                        } else {
                                logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);

diff --git a/include/socgraph.php b/include/socgraph.php
index cd971a7c71405bb40af6fa0c068d46fbc7a50123..db843614a4a2cda6c4ee4b1cd0152328f3aa3884 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -290,16 +290,6 @@ function sanitized_gcontact(&$gcontact) {
 
                $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);
 
                if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) {
@@ -608,15 +598,7 @@ function poco_last_updated($profile, $force = false) {
 
                $gcontact = array_merge($gcontacts[0], $data);
 
-               unset($gcontact["guid"]);
-               unset($gcontact["batch"]);
-               unset($gcontact["poll"]);
-               unset($gcontact["request"]);
-               unset($gcontact["confirm"]);
-               unset($gcontact["poco"]);
-               unset($gcontact["priority"]);
-               unset($gcontact["pubkey"]);
-               unset($gcontact["baseurl"]);
+               $gcontact["server_url"] = $data["baseurl"];
 
                if (sanitized_gcontact($gcontact)) {
                        update_gcontact($gcontact);
@@ -642,16 +624,6 @@ function poco_last_updated($profile, $force = false) {
 
        $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);
 
        $feedret = z_fetch_url($data["poll"]);
@@ -2208,6 +2180,8 @@ function update_gcontact_from_probe($url) {
                return;
        }
 
+       $data["server_url"] = $data["baseurl"];
+
        update_gcontact($data);
 }