Refactor simplify logic and change order in condition for exception t…

…o avoid potential issues
joomla · Jul 23, 2024 · 574d39d · 574d39d
1 parent d049ca1
commit 574d39d
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php
@@ -401,16 +401,12 @@ public function addAttachment($path, $name = '', $encoding = 'base64', $type = '
             $result = true;
 
             if (\is_array($path)) {
-                if (is_array($name) && !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 (isset($name[$key])) {
-                        $result = parent::addAttachment($file, $name[$key], $encoding, $type, $disposition);
-                    } else {
-                        $result = parent::addAttachment($file, basename($file), $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