diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-09-17 16:50:30 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-09-17 16:50:30 -0700 |
| commit | 22429cd432ae99c529040d013b9e25f0549bdf31 (patch) | |
| tree | e29cbcfafeab37d7262d0da6e7524eb11d5eae01 | |
| parent | 68004fc962922b01f81039e1613eb3f8dade0987 (diff) | |
| download | volse-hubzilla-22429cd432ae99c529040d013b9e25f0549bdf31.tar.gz volse-hubzilla-22429cd432ae99c529040d013b9e25f0549bdf31.tar.bz2 volse-hubzilla-22429cd432ae99c529040d013b9e25f0549bdf31.zip | |
friends not being correctly unmarked for death after contact resumed
| -rw-r--r-- | include/Contact.php | 2 | ||||
| -rw-r--r-- | include/poller.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php index 3c41f7650..c59038e5d 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -46,7 +46,7 @@ function mark_for_death($contact) { if(! function_exists('unmark_for_death')) { function unmark_for_death($contact) { // It's a miracle. Our dead contact has inexplicably come back to life. - q("UPDATE `contact` SET `term-date = '%s' WHERE `id` = %d LIMIT 1", + q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1", dbesc('0000-00-00 00:00:00'), intval($contact['id']) ); diff --git a/include/poller.php b/include/poller.php index f116a5622..0980ca1fa 100644 --- a/include/poller.php +++ b/include/poller.php @@ -105,12 +105,14 @@ if(intval($res->status) == 1) mark_for_death($contact); + else { + if($contact['term-date'] != '0000-00-00 00:00:00') + unmark_for_death($contact); + } if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) continue; - if($contact['term-date'] != '0000-00-00 00:00:00') - unmark_for_death($contact); $postvars = array(); |