From: Michael <heluecht@pirati.ca>
Date: Sat, 17 Mar 2018 20:54:56 +0000 (+0000)
Subject: Fewer Defaults
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c42c121e517a7925439a33006f1e355a0f1dc9cc;p=friendica.git

Fewer Defaults
---

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 76413f58b8..d10c4db320 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -1302,7 +1302,7 @@ class PortableContact
 				if (isset($data->version)) {
 					$network = NETWORK_DFRN;
 
-					$noscrape = $data->no_scrape_url;
+					$noscrape = defaults($data->no_scrape_url, '');
 					$version = $data->version;
 					$site_name = $data->site_name;
 					$info = $data->info;
@@ -1355,12 +1355,11 @@ class PortableContact
 		$info = strip_tags($info);
 		$platform = strip_tags($platform);
 
-		$fields = ['url' => $server_url, 'version' => defaults($version, ''),
-				'site_name' => defaults($site_name, ''), 'info' => defaults($info, ''),
-				'register_policy' => defaults($register_policy, 0), 'poco' => defaults($poco, ''),
-				'noscrape' => defaults($noscrape, ''), 'network' => defaults($network, ''),
-				'platform' => defaults($platform, ''), 'registered-users' => defaults($registered_users, 0),
-				'last_contact' => defaults($last_contact, ''), 'last_failure' => defaults($last_failure, '')];
+		$fields = ['url' => $server_url, 'version' => $version,
+				'site_name' => $site_name, 'info' => $info, 'register_policy' => $register_policy,
+				'poco' => $poco, 'noscrape' => $noscrape, 'network' => $network,
+				'platform' => $platform, 'registered-users' => $registered_users,
+				'last_contact' => $last_contact, 'last_failure' => $last_failure];
 
 		if ($found) {
 			dba::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);