Skip to content

Commit

Permalink
Removed the read from Configure for X-Mailer.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbasso committed Apr 13, 2011
1 parent 554d32e commit 22445e2
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions lib/Cake/Network/CakeEmail.php
Expand Up @@ -546,10 +546,7 @@ public function getHeaders($include = array()) {

$headers += $this->_headers;
if (!isset($headers['X-Mailer'])) {
$headers['X-Mailer'] = Configure::read('Email.XMailer');
if (empty($headers['X-Mailer'])) {
$headers['X-Mailer'] = self::EMAIL_CLIENT;
}
$headers['X-Mailer'] = self::EMAIL_CLIENT;
}
if (!isset($headers['Date'])) {
$headers['Date'] = date(DATE_RFC2822);
Expand Down

0 comments on commit 22445e2

Please sign in to comment.