adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-18 23:49:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed the method layout to template. Template is required to render, but layout is not.

Browse source
This commit is contained in:
Juan Basso 2011-04-17 19:40:18 -04:00
parent 38f5d9da1f
commit 7acdf1e436
2 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/Cake/Network/CakeEmail.php
View file

@ -638,22 +638,22 @@ class CakeEmail {
} }
/** /**
* Layout and template * Template and layout
* *
* @param string $layout * @param mixed $template Template name or null to not use
* @param string $template * @param mixed $layout Layout name or null to not use
* @return mixed * @return mixed
*/ */
public function layout($layout = null, $template = null) { public function template($template = false, $layout = false) {
if ($layout === null) { if ($template === false) {
return array( return array(
'layout' => $this->_layout, 'template' => $this->_template,
'template' => $this->_template 'layout' => $this->_layout
); );
} }
$this->_layout = (string)$layout; $this->_template = $template;
if ($template !== null) { if ($layout !== false) {
$this->_template = (string)$template; $this->_layout = $layout;
} }
return $this; return $this;
} }

31
lib/Cake/tests/Case/Network/CakeEmailTest.php
View file

@ -409,7 +409,30 @@ class CakeEmailTest extends CakeTestCase {
} }
/** /**
* testAttachments * testTemplate method
*
* @return void
*/
public function testTemplate() {
$this->CakeEmail->template('template', 'layout');
$expected = array('template' => 'template', 'layout' => 'layout');
$this->assertIdentical($this->CakeEmail->template(), $expected);
$this->CakeEmail->template('new_template');
$expected = array('template' => 'new_template', 'layout' => 'layout');
$this->assertIdentical($this->CakeEmail->template(), $expected);
$this->CakeEmail->template('template', null);
$expected = array('template' => 'template', 'layout' => null);
$this->assertIdentical($this->CakeEmail->template(), $expected);
$this->CakeEmail->template(null, null);
$expected = array('template' => null, 'layout' => null);
$this->assertIdentical($this->CakeEmail->template(), $expected);
}
/**
* testAttachments method
* *
* @return void * @return void
*/ */
@ -510,7 +533,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->to(array('you@cakephp.org' => 'You')); $this->CakeEmail->to(array('you@cakephp.org' => 'You'));
$this->CakeEmail->subject('My title'); $this->CakeEmail->subject('My title');
$this->CakeEmail->config(array('empty')); $this->CakeEmail->config(array('empty'));
$this->CakeEmail->layout('default', 'default'); $this->CakeEmail->template('default', 'default');
$result = $this->CakeEmail->send(); $result = $this->CakeEmail->send();
$this->assertTrue((bool)strpos(DebugTransport::$lastEmail, 'This email was sent using the CakePHP Framework')); $this->assertTrue((bool)strpos(DebugTransport::$lastEmail, 'This email was sent using the CakePHP Framework'));
@ -532,7 +555,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->to(array('you@cakephp.org' => 'You')); $this->CakeEmail->to(array('you@cakephp.org' => 'You'));
$this->CakeEmail->subject('My title'); $this->CakeEmail->subject('My title');
$this->CakeEmail->config(array('empty')); $this->CakeEmail->config(array('empty'));
$this->CakeEmail->layout('default', 'custom'); $this->CakeEmail->template('custom', 'default');
$this->CakeEmail->viewVars(array('value' => 12345)); $this->CakeEmail->viewVars(array('value' => 12345));
$result = $this->CakeEmail->send(); $result = $this->CakeEmail->send();
@ -553,7 +576,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->to(array('you@cakephp.org' => 'You')); $this->CakeEmail->to(array('you@cakephp.org' => 'You'));
$this->CakeEmail->subject('My title'); $this->CakeEmail->subject('My title');
$this->CakeEmail->config(array('empty')); $this->CakeEmail->config(array('empty'));
$this->CakeEmail->layout('default', 'default'); $this->CakeEmail->template('default', 'default');
$this->CakeEmail->emailFormat('both'); $this->CakeEmail->emailFormat('both');
$result = $this->CakeEmail->send(); $result = $this->CakeEmail->send();