adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the default name of email transport. Fixes #1728.

Browse source
This commit is contained in:
Juan Basso 2011-05-24 00:56:28 -04:00
parent 2ea5be5de2
commit 3812ac70cb
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Config/email.php.default
View file

@ -28,8 +28,8 @@
* You can specify multiple configurations for production, development and testing. * You can specify multiple configurations for production, development and testing.
* *
* transport => The name of a supported transport; valid options are as follows: * transport => The name of a supported transport; valid options are as follows:
* mail - Send using PHP mail function * Mail - Send using PHP mail function
* smtp - Send using SMTP * Smtp - Send using SMTP
* *
* You can add custom transports (or override existing transports) by adding the * You can add custom transports (or override existing transports) by adding the
* appropriate file to app/Network/Email. Transports should be named 'YourTransport.php', * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',
@ -42,12 +42,12 @@
class EmailConfig { class EmailConfig {
public $default = array( public $default = array(
'transport' => 'mail', 'transport' => 'Mail',
'from' => 'you@localhost' 'from' => 'you@localhost'
); );
public $smtp = array( public $smtp = array(
'transport' => 'smtp', 'transport' => 'Smtp',
'from' => array('My Site', 'site@localhost'), 'from' => array('My Site', 'site@localhost'),
'host' => 'localhost', 'host' => 'localhost',
'port' => 25, 'port' => 25,
@ -76,7 +76,7 @@ class EmailConfig {
'viewVars' => null, 'viewVars' => null,
'attachments' => null, 'attachments' => null,
'emailFormat' => null, 'emailFormat' => null,
'transport' => 'smtp', 'transport' => 'Smtp',
'host' => 'localhost', 'host' => 'localhost',
'port' => 25, 'port' => 25,
'timeout' => 30, 'timeout' => 30,

10
lib/Cake/Console/templates/skel/Config/email.php.default
View file

@ -28,8 +28,8 @@
* You can specify multiple configurations for production, development and testing. * You can specify multiple configurations for production, development and testing.
* *
* transport => The name of a supported transport; valid options are as follows: * transport => The name of a supported transport; valid options are as follows:
* mail - Send using PHP mail function * Mail - Send using PHP mail function
* smtp - Send using SMTP * Smtp - Send using SMTP
* *
* You can add custom transports (or override existing transports) by adding the * You can add custom transports (or override existing transports) by adding the
* appropriate file to app/Network/Email. Transports should be named 'YourTransport.php', * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',
@ -42,12 +42,12 @@
class EmailConfig { class EmailConfig {
public $default = array( public $default = array(
'transport' => 'mail', 'transport' => 'Mail',
'from' => 'you@localhost' 'from' => 'you@localhost'
); );
public $smtp = array( public $smtp = array(
'transport' => 'smtp', 'transport' => 'Smtp',
'from' => array('My Site', 'site@localhost'), 'from' => array('My Site', 'site@localhost'),
'host' => 'localhost', 'host' => 'localhost',
'port' => 25, 'port' => 25,
@ -76,7 +76,7 @@ class EmailConfig {
'viewVars' => null, 'viewVars' => null,
'attachments' => null, 'attachments' => null,
'emailFormat' => null, 'emailFormat' => null,
'transport' => 'smtp', 'transport' => 'Smtp',
'host' => 'localhost', 'host' => 'localhost',
'port' => 25, 'port' => 25,
'timeout' => 30, 'timeout' => 30,

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

@ -221,7 +221,7 @@ class CakeEmail {
* *
* @var string * @var string
*/ */
protected $_transportName = 'mail'; protected $_transportName = 'Mail';
/** /**
* Instance of transport class * Instance of transport class