Fix not working unarchive contact batch action

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 89a98919175030e354b37c52a31a8800268ea8ad..db300759842ca84806d6627aac350d65df601218 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -138,7 +138,7 @@ class Contact extends BaseModule
 
                $contacts_id = $_POST['contact_batch'];
 
-               $stmt = DBA::select('contact', ['id'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]);
+               $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]);
                $orig_records = DBA::toArray($stmt);
 
                $count_actions = 0;
@@ -336,7 +336,7 @@ class Contact extends BaseModule
 
        private static function archiveContact($contact_id, $orig_record)
        {
-               $archived = (($orig_record['archive']) ? 0 : 1);
+               $archived = (defaults($orig_record, 'archive', '') ? 0 : 1);
                $r = DBA::update('contact', ['archive' => $archived], ['id' => $contact_id, 'uid' => local_user()]);
 
                return DBA::isResult($r);