Avoid storing "null" values

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 5e7cc02a36c1cdf02e0cf84aabea74621d0ca048..2d48fa602acf84ce334951f27f7169fdba050904 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2079,8 +2079,8 @@ class DFRN
                                return false;
                        }
 
-                       $fields = ['title' => $item["title"], 'body' => $item["body"],
-                                       'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+                       $fields = ['title' => defaults($item["title"], ''), 'body' => defaults($item["body"], ''),
+                                       'tag' => defaults($item["tag"], ''), 'changed' => DateTimeFormat::utcNow(),
                                        'edited' => DateTimeFormat::utc($item["edited"])];
 
                        $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 5b419e42eff3d15deb989d8cc8cac66231f71eca..76413f58b8543d196c8e7cdd1d80abca9dbac1dc 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -1355,11 +1355,12 @@ class PortableContact
                $info = strip_tags($info);
                $platform = strip_tags($platform);
 
-               $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];
+               $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, '')];
 
                if ($found) {
                        dba::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);