Merge pull request #4660 from r4ngy4l/patch-1

[ci skip] Fix issues in feaure/email-attachmens

1 files changed, 6 insertions, 6 deletions

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 21b62fea0..0a55e1841 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1426,17 +1426,17 @@ class CI_Email {
 					.$this->_prep_quoted_printable($this->_body).$this->newline.$this->newline
 					.'--'.$alt_boundary.'--'.$this->newline.$this->newline;
 
-				// multipart/mixed attachments
-				if ( ! empty($atc_boundary))
+				if ( ! empty($rel_boundary))
 				{
 					$body .= $this->newline.$this->newline;
-					$this->_append_attachments($body, $atc_boundary, 'mixed');
+					$this->_append_attachments($body, $rel_boundary, 'related');
 				}
 
-				if ( ! empty($rel_boundary))
+				// multipart/mixed attachments
+				if ( ! empty($atc_boundary))
 				{
 					$body .= $this->newline.$this->newline;
-					$this->_append_attachments($body, $rel_boundary, 'related');
+					$this->_append_attachments($body, $atc_boundary, 'mixed');
 				}
 
 				break;
@@ -1455,7 +1455,7 @@ class CI_Email {
 	{
 		foreach ($this->_attachments as &$attachment)
 		{
-			if ($attachment[$i]['multipart'] === $type)
+			if ($attachment['multipart'] === $type)
 			{
 				return TRUE;
 			}