|
|
@@ -670,7 +670,7 @@ class CakeEmail {
|
|
|
} elseif ($this->_emailFormat === 'both') {
|
|
|
$headers['Content-Type'] = 'multipart/alternative; boundary="alt-' . $this->_boundary . '"';
|
|
|
}
|
|
|
- $headers['Content-Transfer-Encoding'] = $this->getContentTransferEncoding();
|
|
|
+ $headers['Content-Transfer-Encoding'] = $this->_getContentTransferEncoding();
|
|
|
|
|
|
return $headers;
|
|
|
}
|
|
|
@@ -1278,7 +1278,7 @@ class CakeEmail {
|
|
|
} elseif ($this->_emailFormat === 'both') {
|
|
|
$prefix[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->_boundary . '"';
|
|
|
}
|
|
|
- $prefix[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
|
|
|
+ $prefix[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
|
|
|
$prefix[] = '';
|
|
|
$message = array_merge($prefix, $message);
|
|
|
}
|
|
|
@@ -1331,7 +1331,7 @@ class CakeEmail {
|
|
|
}
|
|
|
$msg[] = '--alt-' . $this->_boundary;
|
|
|
$msg[] = 'Content-Type: text/plain; charset=' . $this->charset;
|
|
|
- $msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
|
|
|
+ $msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
|
|
|
$msg[] = '';
|
|
|
|
|
|
$View->viewPath = $View->layoutPath = 'Emails' . DS . 'text';
|
|
|
@@ -1343,7 +1343,7 @@ class CakeEmail {
|
|
|
$msg[] = '';
|
|
|
$msg[] = '--alt-' . $this->_boundary;
|
|
|
$msg[] = 'Content-Type: text/html; charset=' . $this->charset;
|
|
|
- $msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
|
|
|
+ $msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
|
|
|
$msg[] = '';
|
|
|
|
|
|
$View->viewPath = $View->layoutPath = 'Emails' . DS . 'html';
|
|
|
@@ -1365,12 +1365,12 @@ class CakeEmail {
|
|
|
$msg[] = '';
|
|
|
$msg[] = '--' . $this->_boundary;
|
|
|
$msg[] = 'Content-Type: text/html; charset=' . $this->charset;
|
|
|
- $msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
|
|
|
+ $msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
|
|
|
$msg[] = '';
|
|
|
} else {
|
|
|
$msg[] = '--' . $this->_boundary;
|
|
|
$msg[] = 'Content-Type: text/plain; charset=' . $this->charset;
|
|
|
- $msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
|
|
|
+ $msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
|
|
|
$msg[] = '';
|
|
|
}
|
|
|
}
|
|
|
@@ -1394,7 +1394,7 @@ class CakeEmail {
|
|
|
*
|
|
|
* @return void
|
|
|
*/
|
|
|
- private function getContentTransferEncoding() {
|
|
|
+ protected function _getContentTransferEncoding() {
|
|
|
$charset = strtoupper($this->charset);
|
|
|
if (in_array($charset, $this->_charset8bit)) {
|
|
|
return '8bit';
|