tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4759 from edlinklater/3.2-mailer-validemailaddr

Browse Source 
Handle incorrectly deprecated validEmailAddr methods
This commit is contained in:
Damian Mooyman 2015-11-10 13:36:15 +13:00
commit 8368ead424
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
email/Mailer.php
View File

@ -451,6 +451,14 @@ class Mailer extends Object {
return $headers . $file['contents']; return $headers . $file['contents'];
} }
/**
* @deprecated since version 4.0
*/
public function validEmailAddr($emailAddress) {
Deprecation::notice('4.0', 'This method will be removed in 4.0. Use protected method Mailer->validEmailAddress().');
return $this->validEmailAddress($emailAddress);
}
/** /**
* Cleans up emails which may be in 'Name <email@silverstripe.com>' format * Cleans up emails which may be in 'Name <email@silverstripe.com>' format
* *
@ -596,7 +604,7 @@ function QuotedPrintable_encode($quotprint) {
* @deprecated 3.1 * @deprecated 3.1
*/ */
function validEmailAddr($emailAddress) { function validEmailAddr($emailAddress) {
Deprecation::notice('4.0', 'Use Email->validEmailAddr() instead'); Deprecation::notice('4.0', 'This method will be removed in 4.0. Use protected method Mailer->validEmailAddress().');
$mailer = Injector::inst()->create('Mailer'); $mailer = Injector::inst()->create('Mailer');
return $mailer->validEmailAddr($emailAddress); return $mailer->validEmailAddr($emailAddress);