fix: make single attachment forms validatable using the Yii file vali…

…dator
nstCactus · Jan 18, 2024 · 48deb41 · 48deb41
1 parent bb6ab42
commit 48deb41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Mailer.php b/src/Mailer.php
@@ -71,7 +71,8 @@ public function send(Submission $submission, bool $runValidation = true): bool
         if ($submission->attachment !== null) {
             $allowedFileTypes = Craft::$app->getConfig()->getGeneral()->allowedFileExtensions;
 
-            foreach ($submission->attachment as $attachment) {
+            $attachments = is_array($submission->attachment) ? $submission->attachment : [$submission->attachment];
+            foreach ($attachments as $attachment) {
                 if (!$attachment) {
                     continue;
                 }

diff --git a/src/controllers/SendController.php b/src/controllers/SendController.php
@@ -46,7 +46,7 @@ public function actionIndex()
             if (is_array($_FILES['attachment']['name'])) {
                 $submission->attachment = UploadedFile::getInstancesByName('attachment');
             } else {
-                $submission->attachment = [UploadedFile::getInstanceByName('attachment')];
+                $submission->attachment = UploadedFile::getInstanceByName('attachment');
             }
         }