Permalink
Browse files

Changed getContentTransferEncoding to protected

  • Loading branch information...
1 parent 51dd024 commit 7ed6e041b935ea594fbd3e0320ea96a658cfd879 @predominant predominant committed Oct 22, 2011
Showing with 7 additions and 7 deletions.
  1. +7 −7 lib/Cake/Network/Email/CakeEmail.php
View
14 lib/Cake/Network/Email/CakeEmail.php
@@ -670,7 +670,7 @@ public function getHeaders($include = array()) {
} 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 @@ protected function _formatMessage($message) {
} 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 @@ protected function _render($content) {
}
$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 @@ protected function _render($content) {
$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 @@ protected function _render($content) {
$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 @@ protected function _render($content) {
*
* @return void
*/
- private function getContentTransferEncoding() {
+ protected function _getContentTransferEncoding() {
$charset = strtoupper($this->charset);
if (in_array($charset, $this->_charset8bit)) {
return '8bit';

0 comments on commit 7ed6e04

Please sign in to comment.