Skip to content

Commit

Permalink
With class loading these code can be global.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbasso committed Apr 17, 2011
1 parent 9ac5f9c commit 3a5c042
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Network/CakeEmail.php
Expand Up @@ -19,6 +19,8 @@
App::uses('Validation', 'Utility');
App::uses('Multibyte', 'I18n');
App::uses('AbstractTransport', 'Network/Email');
App::uses('String', 'Utility');
App::uses('View', 'View');

/**
* Cake e-mail class.
Expand Down Expand Up @@ -567,7 +569,6 @@ public function getHeaders($include = array()) {
}
if ($this->_messageId !== false) {
if ($this->_messageId === true) {
App::uses('String', 'Utility');
$headers['Message-ID'] = '<' . String::UUID() . '@' . env('HTTP_HOST') . '>';
} else {
$headers['Message-ID'] = $this->_messageId;
Expand Down Expand Up @@ -1078,7 +1079,6 @@ protected function _formatMessage($message) {
protected function _render($content) {
$viewClass = $this->_viewRender;

App::uses('View', 'View');
if ($viewClass !== 'View') {
list($plugin, $viewClass) = pluginSplit($viewClass, true);
$viewClass .= 'View';
Expand Down

0 comments on commit 3a5c042

Please sign in to comment.