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

Allow setting only default layout without specifying template in email config.

Browse source 
Closes #3336
This commit is contained in:
ADmad 2014-04-22 19:50:18 +05:30
parent bd5ce96388
commit ead494eec1
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1224,15 +1224,14 @@ class CakeEmail {
$this->setHeaders($config['headers']); $this->setHeaders($config['headers']);
unset($config['headers']); unset($config['headers']);
} }
if (array_key_exists('template', $config)) { if (array_key_exists('template', $config)) {
$layout = false; $this->_template = $config['template'];
if (array_key_exists('layout', $config)) {
$layout = $config['layout'];
unset($config['layout']);
}
$this->template($config['template'], $layout);
unset($config['template']);
} }
if (array_key_exists('layout', $config)) {
$this->_layout = $config['layout'];
}
$this->transportClass()->config($config); $this->transportClass()->config($config);
} }

20
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -1807,6 +1807,26 @@ class CakeEmailTest extends CakeTestCase {
$this->assertTrue((bool)strpos($result['headers'], 'To: ')); $this->assertTrue((bool)strpos($result['headers'], 'To: '));
} }
/**
* testConfigArrayWithLayoutWithoutTemplate method
*
* @return void
*/
public function testConfigArrayWithLayoutWithoutTemplate() {
$configs = array(
'from' => array('some@example.com' => 'My website'),
'to' => 'test@example.com',
'subject' => 'Test mail subject',
'transport' => 'Debug',
'layout' => 'custom'
);
$this->CakeEmail = new CakeEmail($configs);
$result = $this->CakeEmail->template();
$this->assertEquals('', $result['template']);
$this->assertEquals($configs['layout'], $result['layout']);
}
/** /**
* testConstructWithConfigString method * testConstructWithConfigString method
* *