Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Conflicts:
	include/onepoll.php

diff --cc boot.php
Simple merge

diff --cc include/Contact.php
Simple merge

diff --cc include/dbstructure.php
Simple merge

diff --cc include/onepoll.php
index 90ca639dd1eb025015c25204ebf07a62a59ef081,552fea36fa9bd9c7d9d7dc15734e41a77953a63a..bfb904fb60ed2c8859485029e6537203c252b125
--- 1/include/onepoll.php
--- 2/include/onepoll.php
+++ b/include/onepoll.php
@@@ -248,18 -265,16 +265,16 @@@ function onepoll_run(&$argv, &$argc)
                                intval($contact['id'])
                        );
                        mark_for_death($contact);
-               }
-               else {
-                       if ($contact['term-date'] > NULL_DATE) {
-                               logger("poller: $url back from the dead - removing mark for death");
-                               unmark_for_death($contact);
-                       }
 -              } elseif ($contact['term-date'] != '0000-00-00 00:00:00') {
++              } elseif ($contact['term-date'] > NULL_DATE) {
+                       logger("poller: $url back from the dead - removing mark for death");
+                       unmark_for_death($contact);
                }
  
-               if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+               if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
                        return;
+               }
  
-               if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
+               if (((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
                        q("update contact set poco = '%s' where id = %d",
                                dbesc(str_replace('/profile/','/poco/', $contact['url'])),
                                intval($contact['id'])

diff --cc include/poller.php
Simple merge

diff --cc include/socgraph.php
index b5fc5aa659e2b139deaac213fc8ea2f8ded7c3e7,01d2cff019f34cbf0e859b19f1284d4b5c96a6be..152f713c10a5441978f2d8935ad119da724c3478
--- 1/include/socgraph.php
--- 2/include/socgraph.php
+++ b/include/socgraph.php
@@@ -690,9 -690,9 +690,9 @@@ function poco_check_server($server_url
                return false;
  
        $servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
-       if ($servers) {
+       if (dbm::is_result($servers)) {
  
 -              if ($servers[0]["created"] == "0000-00-00 00:00:00")
 +              if ($servers[0]["created"] <= NULL_DATE)
                        q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
                                dbesc(datetime_convert()), dbesc(normalise_link($server_url)));
  

diff --cc update.php
Simple merge