From 26ec56dfa58d8d20cd6ed06801d77ac857bf1c19 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 23 Mar 2017 06:45:00 +0000
Subject: [PATCH] server_url was forgotten

---
 include/discover_poco.php |  3 +++
 include/socgraph.php      | 32 +++-----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 5a0ca70a47..4c52fdd3ef 100644
--- 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 cd971a7c71..db843614a4 100644
--- 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);
 }