Merge branch 'master' into develop

[friendica.git] / src / Protocol / PortableContact.php

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 46862b4065e4a8ca0230f9ea3d5d0bd64a8f2a88..ff2b2fca6179bfeb0dd66979abb96901a1cf3d68 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -945,6 +945,15 @@ class PortableContact
                        $register_policy = $gserver["register_policy"];
                        $registered_users = $gserver["registered-users"];
 
+                       // See discussion under https://forum.friendi.ca/display/0b6b25a8135aabc37a5a0f5684081633
+                       // It can happen that a zero date is in the database, but storing it again is forbidden.
+                       if ($last_contact < NULL_DATE) {
+                               $last_contact = NULL_DATE;
+                       }
+                       if ($last_failure < NULL_DATE) {
+                               $last_failure = NULL_DATE;
+                       }
+
                        if (!$force && !self::updateNeeded($gserver["created"], "", $last_failure, $last_contact)) {
                                logger("Use cached data for server ".$server_url, LOGGER_DEBUG);
                                return ($last_contact >= $last_failure);
@@ -1302,7 +1311,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;