[5.1] Fix attachment handling in libraries Mail class (joomla#43828)

brianteeman · Jul 23, 2024 · dabf3fe · dabf3fe
1 parent 183985b
commit dabf3fe
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php
@@ -401,28 +401,20 @@ public function addAttachment($path, $name = '', $encoding = 'base64', $type = '
             $result = true;
 
             if (\is_array($path)) {
-                if (!empty($name) && \count($path) != \count($name)) {
+                if (!empty($name) && \is_array($name) && \count($path) != \count($name)) {
                     throw new \InvalidArgumentException('The number of attachments must be equal with the number of name');
                 }
 
                 foreach ($path as $key => $file) {
-                    if (!empty($name)) {
-                        $result = parent::addAttachment($file, $name[$key], $encoding, $type);
-                    } else {
-                        if (!empty($name)) {
-                            $result = parent::addAttachment($file, $name[$key], $encoding, $type, $disposition);
-                        } else {
-                            $result = parent::addAttachment($file, $name, $encoding, $type, $disposition);
-                        }
-                    }
+                    $result = parent::addAttachment($file, isset($name[$key]) ? $name[$key] : '', $encoding, $type, $disposition);
                 }
 
                 // Check for boolean false return if exception handling is disabled
                 if ($result === false) {
                     return false;
                 }
             } else {
-                $result = parent::addAttachment($path, $name, $encoding, $type);
+                $result = parent::addAttachment($path, $name, $encoding, $type, $disposition);
             }
 
             // Check for boolean false return if exception handling is disabled