Merge branch 'staging' into 3.x-jversion

joomla · Apr 25, 2019 · 1bac885 · 1bac885
2 parents 1ea122b + f073867
commit 1bac885
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php
@@ -64,6 +64,17 @@ public function __construct($exceptions = true)
 
 		// Don't disclose the PHPMailer version
 		$this->XMailer = ' ';
+
+		/*
+		 * PHPMailer 5.2 can't validate e-mail addresses with the new regex library used in PHP 7.3+
+		 * Setting $validator to "php" uses the native php function filter_var
+		 *
+		 * @see https://github.com/joomla/joomla-cms/issues/24707
+		 */
+		if (version_compare(PHP_VERSION, '7.3.0', '>='))
+		{
+			\PHPMailer::$validator = 'php';
+		}
 	}
 
 	/**