Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

[friendica.git] / include / dfrn.php

diff --git a/include/dfrn.php b/include/dfrn.php
index 1240228f06f19bd55d67608499c393dba606835d..9fa19bde6cf13743eb7ab78a8d81bf6c0fadaa6a 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1182,7 +1182,8 @@ class dfrn {
                        return 3;
                }
 
-               if ($contact['term-date'] != '0000-00-00 00:00:00') {
+               /// @TODO Really compare with > here? Maybe DateTime (which allows such comparison again) is much safer/correcter
+               if ($contact['term-date'] > NULL_DATE) {
                        logger("dfrn_deliver: $url back from the dead - removing mark for death");
                        require_once('include/Contact.php');
                        unmark_for_death($contact);