Merge branch 'develop' into 'main'

Release 22-07-2021

See merge request !442

extensions/t3org_layout/Classes/Command/FetchMembersCommand.php

@@ -56,14 +56,14 @@ class FetchMembersCommand extends Command
         $this->queryBuilder
             ->update('tx_t3omembership_domain_model_member')
             ->where(
-                $this->queryBuilder->expr()->neq('external_identifier', '""')
+                $this->queryBuilder->expr()->neq('external_identifier', '""'),
+                $this->queryBuilder->expr()->eq('pid', (int)$this->extConfig['MemberStorage'])
             )
             ->set('hidden', 1)
             ->execute();
 
         $this->queryBuilder = $this->queryBuilder->getConnection()->createQueryBuilder();
 
-        $warnings = false;
         foreach ($members as $member) {
             $this->queryBuilder = $this->queryBuilder->getConnection()->createQueryBuilder();
             $this->queryBuilder
@@ -94,6 +94,7 @@ class FetchMembersCommand extends Command
                 $data['tstamp'] = time();
                 $data['crdate'] = time();
                 $data['membership'] = $this->getMembershipId($data['membership']);
+                $data['email'] = $data['email'] ?? '';
 
                 unset($data['votingEmail']);
                 unset($data['identifier']);