unmark for archival

diff --git a/include/items.php b/include/items.php
index f0470feb7e0570f30249b064bd2c0eae9e118665..e49eadd86d3970e3f8df27f5d49a83291dc35cf1 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1151,6 +1151,10 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
  * @param array $arr Contains the just posted item record
  */
 function item_set_last_item($arr) {
+       $contact = dba::select('contact', [], ['id' => $arr['contact-id']], ['limit' => 1]);
+       if ($contact['term-date'] > NULL_DATE) {
+                Contact::unmarkForArchival($contact);
+       }
 
        $update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
 
@@ -1166,10 +1170,6 @@ function item_set_last_item($arr) {
        if ($update) {
                dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']),
                        array('id' => $arr['contact-id']));
-               $contact = dba::select('contact', [], ['id' => $arr['contact-id']], ['limit' => 1]);
-               if ($contact['term-date'] > NULL_DATE) {
-                        Contact::unmarkForArchival($contact);
-               }
        }
        // Now do the same for the system wide contacts with uid=0
        if (!$arr['private']) {

diff --git a/src/Object/Contact.php b/src/Object/Contact.php
index af84899586ec669bebbbf7854709103374baf4f9..f0299603ec453478df01db12af53d6f96f02e7dd 100644 (file)
--- a/src/Object/Contact.php
+++ b/src/Object/Contact.php
@@ -145,7 +145,6 @@ class Contact extends BaseObject
                if ($contact['archive']) {
                        return;
                }
-logger('Blubb-m: '.$contact['id'].' - '.System::callstack());
                if ($contact['term-date'] <= NULL_DATE) {
                        dba::update('contact', array('term-date' => datetime_convert()), array('id' => $contact['id']));
 
@@ -185,8 +184,7 @@ logger('Blubb-m: '.$contact['id'].' - '.System::callstack());
         */
        public static function unmarkForArchival(array $contact)
        {
-//logger('Blubb-m: '.$contact['id'].' - '.System::callstack());
-               $condition = array('`id` = ? AND (`term-date` > ? OR `archive`)', $contact[`id`], NULL_DATE);
+               $condition = array('`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE);
                $exists = dba::exists('contact', $condition);
 
                // We don't need to update, we never marked this contact for archival