Merge branch 'next' into 'master'

Next

See merge request !31

src/QUI/FrontendUsers/Handler.php

@@ -11,6 +11,8 @@
 use QUI\Utils\Singleton;
 use QUI\Verification\Verifier;
 
+use function array_filter;
+
 /**
  * Class Registration Handling
  * - Main Registration Handler
@@ -471,6 +473,12 @@ public function sendActivationMail(QUI\Users\User $User, RegistrarInterface $Reg
      */
     public function sendWelcomeMail(QUI\Users\User $User, QUI\Projects\Project $Project, $userPassword = null)
     {
+        $email = $User->getAttribute('email');
+
+        if (empty($email)) {
+            return;
+        }
+
         $L = QUI::getLocale();
         $lg = 'quiqqer/frontend-users';
         $tplDir = QUI::getPackage('quiqqer/frontend-users')->getDir() . 'templates/';
@@ -491,7 +499,7 @@ public function sendWelcomeMail(QUI\Users\User $User, QUI\Projects\Project $Proj
                     ])
                 ],
                 [
-                    $User->getAttribute('email')
+                    $email
                 ],
                 $tplDir . 'mail.registration_welcome.html',
                 [
@@ -704,6 +712,12 @@ public function sendMail($mailData, $recipients, $templateFile, $templateVars =
             return;
         }
 
+        $recipients = array_filter($recipients);
+
+        if (empty($recipients)) {
+            return;
+        }
+
         $mailSettings = self::getMailSettings();
         $Engine = QUI::getTemplateManager()->getEngine();