adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #493 from cdvrooman/2.1

Browse source 
Improved two CakeEmail error messages
This commit is contained in:
José Lorenzo Rodríguez 2012-02-19 08:56:55 -08:00
commit bd5268b941
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -828,7 +828,7 @@ class CakeEmail {
$this->_messageId = $message; $this->_messageId = $message;
} else { } else {
if (!preg_match('/^\<.+@.+\>$/', $message)) { if (!preg_match('/^\<.+@.+\>$/', $message)) {
throw new SocketException(__d('cake_dev', 'Invalid format to Message-ID. The text should be something like "<uuid@server.com>"')); throw new SocketException(__d('cake_dev', 'Invalid format for Message-ID. The text should be something like "<uuid@server.com>"'));
} }
$this->_messageId = $message; $this->_messageId = $message;
} }
@ -957,7 +957,7 @@ class CakeEmail {
throw new SocketException(__d('cake_dev', 'From is not specified.')); throw new SocketException(__d('cake_dev', 'From is not specified.'));
} }
if (empty($this->_to) && empty($this->_cc) && empty($this->_bcc)) { if (empty($this->_to) && empty($this->_cc) && empty($this->_bcc)) {
throw new SocketException(__d('cake_dev', 'You need specify one destination on to, cc or bcc.')); throw new SocketException(__d('cake_dev', 'You need to specify at least one destination for to, cc or bcc.'));
} }
if (is_array($content)) { if (is_array($content)) {