Follow-up to bug #8399: Table index was too long after changing the field size
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_htmlmail.php
index 894fa31..9ae979f 100755 (executable)
@@ -531,7 +531,7 @@ class t3lib_htmlmail {
         * @return      string          the content type
         */
        public function getHTMLContentType() {
-               return (count($this->theParts['html']['media']) ? 'multipart/related;' : 'multipart/alternative;');
+               return (count($this->theParts['html']['media']) ? 'multipart/related' : 'multipart/alternative');
        }
 
 
@@ -715,7 +715,7 @@ class t3lib_htmlmail {
                        // but instead the php.ini parameter sendmail_from is used.
                $returnPath = (strlen($this->returnPath) > 0) ? '-f "' . escapeshellarg($this->returnPath) . '"' : '';
                if($this->returnPath) {
-                       ini_set('sendmail_from', t3lib_div::normalizeMailAddress($this->returnPath));
+                       @ini_set('sendmail_from', t3lib_div::normalizeMailAddress($this->returnPath));
                }
                $recipient = t3lib_div::normalizeMailAddress($this->recipient);
                $recipient_copy = t3lib_div::normalizeMailAddress($this->recipient_copy);
@@ -1503,4 +1503,5 @@ class t3lib_htmlmail {
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_htmlmail.php']) {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_htmlmail.php']);
 }
-?>
+
+?>
\ No newline at end of file