With class loading these code can be global.

This commit is contained in:
Juan Basso 2011-04-15 22:02:07 -04:00
parent 9ac5f9c349
commit 3a5c04273e

View file

@ -19,6 +19,8 @@
App::uses('Validation', 'Utility'); App::uses('Validation', 'Utility');
App::uses('Multibyte', 'I18n'); App::uses('Multibyte', 'I18n');
App::uses('AbstractTransport', 'Network/Email'); App::uses('AbstractTransport', 'Network/Email');
App::uses('String', 'Utility');
App::uses('View', 'View');
/** /**
* Cake e-mail class. * Cake e-mail class.
@ -567,7 +569,6 @@ class CakeEmail {
} }
if ($this->_messageId !== false) { if ($this->_messageId !== false) {
if ($this->_messageId === true) { if ($this->_messageId === true) {
App::uses('String', 'Utility');
$headers['Message-ID'] = '<' . String::UUID() . '@' . env('HTTP_HOST') . '>'; $headers['Message-ID'] = '<' . String::UUID() . '@' . env('HTTP_HOST') . '>';
} else { } else {
$headers['Message-ID'] = $this->_messageId; $headers['Message-ID'] = $this->_messageId;
@ -1078,7 +1079,6 @@ class CakeEmail {
protected function _render($content) { protected function _render($content) {
$viewClass = $this->_viewRender; $viewClass = $this->_viewRender;
App::uses('View', 'View');
if ($viewClass !== 'View') { if ($viewClass !== 'View') {
list($plugin, $viewClass) = pluginSplit($viewClass, true); list($plugin, $viewClass) = pluginSplit($viewClass, true);
$viewClass .= 'View'; $viewClass .= 'View';