Merge branch 'develop' into issue/3878-move-Contact-to-src

diff --cc boot.php
Simple merge

diff --cc mod/admin.php
Simple merge

diff --cc src/Worker/OnePoll.php
index 122b400bb8f2b9f24353f340ac0a6fe13785c377,374c69f13f1cd519194b2981b6440afe1a3a004f..356fce4337ff2a708c0c28185a0051b8cae39f4c
--- 1/src/Worker/OnePoll.php
--- 2/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@@ -206,9 -206,9 +206,9 @@@ Class OnePol
                        }
  
                        if (!strstr($handshake_xml, '<')) {
-                               logger('poller: response from ' . $url . ' did not contain XML.');
+                               logger('response from ' . $url . ' did not contain XML.');
  
 -                              mark_for_death($contact);
 +                              Contact::markForArchival($contact);
  
                                $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
                                dba::update('contact', $fields, array('id' => $contact['id']));
@@@ -227,10 -227,10 +227,10 @@@
                                $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
                                dba::update('contact', $fields, array('id' => $contact['id']));
  
 -                              mark_for_death($contact);
 +                              Contact::markForArchival($contact);
                        } elseif ($contact['term-date'] > NULL_DATE) {
-                               logger("poller: $url back from the dead - removing mark for death");
+                               logger("$url back from the dead - removing mark for death");
 -                              unmark_for_death($contact);
 +                              Contact::unmarkForArchival($contact);
                        }
  
                        if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {