From 856722a5616ce4c65dec00699f1019c641ee7b82 Mon Sep 17 00:00:00 2001
From: Ed Linklater <ed@silverstripe.com>
Date: Tue, 10 Nov 2015 13:17:27 +1300
Subject: [PATCH] Handle incorrectly deprecated validEmailAddr methods

---
 email/Mailer.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 <email@silverstripe.com>' 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);
 }