diff --git a/app/Config/email.php.default b/app/Config/email.php.default index 66c378f35..f55496ae4 100644 --- a/app/Config/email.php.default +++ b/app/Config/email.php.default @@ -28,8 +28,8 @@ * You can specify multiple configurations for production, development and testing. * * transport => The name of a supported transport; valid options are as follows: - * mail - Send using PHP mail function - * smtp - Send using SMTP + * Mail - Send using PHP mail function + * Smtp - Send using SMTP * * You can add custom transports (or override existing transports) by adding the * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php', @@ -42,12 +42,12 @@ class EmailConfig { public $default = array( - 'transport' => 'mail', + 'transport' => 'Mail', 'from' => 'you@localhost' ); public $smtp = array( - 'transport' => 'smtp', + 'transport' => 'Smtp', 'from' => array('My Site', 'site@localhost'), 'host' => 'localhost', 'port' => 25, @@ -76,7 +76,7 @@ class EmailConfig { 'viewVars' => null, 'attachments' => null, 'emailFormat' => null, - 'transport' => 'smtp', + 'transport' => 'Smtp', 'host' => 'localhost', 'port' => 25, 'timeout' => 30, diff --git a/lib/Cake/Console/templates/skel/Config/email.php.default b/lib/Cake/Console/templates/skel/Config/email.php.default index 66c378f35..f55496ae4 100644 --- a/lib/Cake/Console/templates/skel/Config/email.php.default +++ b/lib/Cake/Console/templates/skel/Config/email.php.default @@ -28,8 +28,8 @@ * You can specify multiple configurations for production, development and testing. * * transport => The name of a supported transport; valid options are as follows: - * mail - Send using PHP mail function - * smtp - Send using SMTP + * Mail - Send using PHP mail function + * Smtp - Send using SMTP * * You can add custom transports (or override existing transports) by adding the * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php', @@ -42,12 +42,12 @@ class EmailConfig { public $default = array( - 'transport' => 'mail', + 'transport' => 'Mail', 'from' => 'you@localhost' ); public $smtp = array( - 'transport' => 'smtp', + 'transport' => 'Smtp', 'from' => array('My Site', 'site@localhost'), 'host' => 'localhost', 'port' => 25, @@ -76,7 +76,7 @@ class EmailConfig { 'viewVars' => null, 'attachments' => null, 'emailFormat' => null, - 'transport' => 'smtp', + 'transport' => 'Smtp', 'host' => 'localhost', 'port' => 25, 'timeout' => 30, diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php index 8602cf9c3..545581ba1 100644 --- a/lib/Cake/Network/Email/CakeEmail.php +++ b/lib/Cake/Network/Email/CakeEmail.php @@ -221,7 +221,7 @@ class CakeEmail { * * @var string */ - protected $_transportName = 'mail'; + protected $_transportName = 'Mail'; /** * Instance of transport class