Fix Exceptions in Email::addMimePart()

diff --git a/wcfsetup/install/files/lib/system/email/Email.class.php b/wcfsetup/install/files/lib/system/email/Email.class.php
index 86c26c3de8f74fc491594b88ca5ac1fb16645d3c..0822fca22667ae4deb9de6d88cd20b2c57bb981f 100644 (file)
--- a/wcfsetup/install/files/lib/system/email/Email.class.php
+++ b/wcfsetup/install/files/lib/system/email/Email.class.php
@@ -382,11 +382,11 @@ class Email {
                foreach ($part->getAdditionalHeaders() as $header) {
                        $header[0] = mb_strtolower($header[0]);
                        if ($header[0] == 'content-type' || $header[0] == 'content-transfer-encoding') {
-                               throw new SystemException("The header '".$header."' may not be set. Use the proper methods.");
+                               throw new SystemException("The header '".$header[0]."' may not be set. Use the proper methods.");
                        }
                        
                        if (!StringUtil::startsWith($header[0], 'x-') && !StringUtil::startsWith($header[0], 'content-')) {
-                               throw new SystemException("The header '".$header."' may not be set. You may only set headers starting with 'X-' or 'Content-'.");
+                               throw new SystemException("The header '".$header[0]."' may not be set. You may only set headers starting with 'X-' or 'Content-'.");
                        }
                }
                
@@ -395,7 +395,7 @@ class Email {
                        case 'quoted-printable':
                        break;
                        default:
-                               throw new SystemException("The Content-Transfer-Encoding '".$header."' may not be set. You may only use 'quoted-printable' or 'base64'.");
+                               throw new SystemException("The Content-Transfer-Encoding '".$part->getContentTransferEncoding()."' may not be set. You may only use 'quoted-printable' or 'base64'.");
                }
                
                if ($part instanceof TextMimePart) {