diff --git a/email/Mailer.php b/email/Mailer.php index cdc15bcec..67b624431 100644 --- a/email/Mailer.php +++ b/email/Mailer.php @@ -451,6 +451,14 @@ class Mailer extends Object { 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 ' format * @@ -596,8 +604,8 @@ function QuotedPrintable_encode($quotprint) { * @deprecated 3.1 */ 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'); - return $mailer->validEmailAddr($emailAddress); + return $mailer->validEmailAddr($emailAddress); }