mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
allow callbacks to modify attachements by moving the decision to calculate boundary value into the correct position inside _render()
This commit is contained in:
parent
468eb94e94
commit
0ca1ba3211
1 changed files with 1 additions and 1 deletions
|
@ -1071,7 +1071,6 @@ class CakeEmail {
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->_textMessage = $this->_htmlMessage = '';
|
$this->_textMessage = $this->_htmlMessage = '';
|
||||||
$this->_createBoundary();
|
|
||||||
$this->_message = $this->_render($this->_wrap($content));
|
$this->_message = $this->_render($this->_wrap($content));
|
||||||
|
|
||||||
$contents = $this->transportClass()->send($this);
|
$contents = $this->transportClass()->send($this);
|
||||||
|
@ -1447,6 +1446,7 @@ class CakeEmail {
|
||||||
$content = implode("\n", $content);
|
$content = implode("\n", $content);
|
||||||
$rendered = $this->_renderTemplates($content);
|
$rendered = $this->_renderTemplates($content);
|
||||||
|
|
||||||
|
$this->_createBoundary();
|
||||||
$msg = array();
|
$msg = array();
|
||||||
|
|
||||||
$contentIds = array_filter((array)Hash::extract($this->_attachments, '{s}.contentId'));
|
$contentIds = array_filter((array)Hash::extract($this->_attachments, '{s}.contentId'));
|
||||||
|
|
Loading…
Reference in a new issue