adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Closes #3429, scripts_for_layout are lost when you send an email with EmailComponent

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5874 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-10-22 23:52:12 +00:00
parent beb600094b
commit 56425c7f39
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/controller/components/email.php
View file

@ -362,7 +362,7 @@ class EmailComponent extends Object{
$viewClass = $viewClass . 'View'; $viewClass = $viewClass . 'View';
loadView($this->Controller->view); loadView($this->Controller->view);
} }
$View = new $viewClass($this->Controller); $View = new $viewClass($this->Controller, false);
$View->layout = $this->layout; $View->layout = $this->layout;
$msg = null; $msg = null;

4
cake/libs/view/view.php
View file

@ -262,7 +262,7 @@ class View extends Object {
* *
* @return View * @return View
*/ */
function __construct(&$controller) { function __construct(&$controller, $register = true) {
if (is_object($controller)) { if (is_object($controller)) {
$count = count($this->__passedVars); $count = count($this->__passedVars);
for ($j = 0; $j < $count; $j++) { for ($j = 0; $j < $count; $j++) {
@ -278,8 +278,10 @@ class View extends Object {
); );
} }
parent::__construct(); parent::__construct();
if($register) {
ClassRegistry::addObject('view', $this); ClassRegistry::addObject('view', $this);
} }
}
/** /**
* Renders view for given action and layout. If $file is given, that is used * Renders view for given action and layout. If $file is given, that is used