Merge branch '2021.11' into 2022.11

tine20 · Mar 16, 2022 · e26268d · e26268d
2 parents db6ddf1 + 56a9852
commit e26268d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tine20/Felamimail/Controller/Sieve.php b/tine20/Felamimail/Controller/Sieve.php
@@ -642,10 +642,12 @@ protected function _doMessageSubstitutions(Felamimail_Model_Sieve_Vacation $vaca
         $timezone = Tinebase_Core::getUserTimezone();
         $representatives = ($vacation->contact_ids) ? Addressbook_Controller_Contact::getInstance()->getMultiple($vacation->contact_ids) : array();
         if ($vacation->contact_ids && count($representatives) > 0) {
-            // sort representatives
+            // sort and expand representatives
             $representativesArray = array();
             foreach ($vacation->contact_ids as $id) {
-                $representativesArray[] = $representatives->getById($id);
+                if ($contact = $representatives->getById($id)) {
+                    $representativesArray[] = $contact;
+                }
             }
         }
         try {