Merge https://github.com/friendica/friendica into pull

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 3b255a072ad6a208f4b19a1528c97457b851a36c..14e1a52cddfdb3400cc6cf54f9ce3821432f38e4 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -139,6 +139,10 @@ function terminate_friendship($user,$self,$contact) {
  
 if(! function_exists('mark_for_death')) {
 function mark_for_death($contact) {
+
+       if($contact['archive'])
+               return;
+
        if($contact['term-date'] == '0000-00-00 00:00:00') {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
                                dbesc(datetime_convert()),