Find e-mail addresse like a@b.com in String::encodeEmail() (see #…

…5175)
contao · Jan 2, 2013 · 8e03685 · 8e03685
1 parent e6ab7f9
commit 8e03685
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS Changelog
 Version 3.0.2 (2013-XX-XX)
 --------------------------
 
+### Fixed
+Find e-mail addresse like `a@b.com` in `String::encodeEmail()` (see #5175).
+
 ### Fixed
 Make sure there is a minimal MooTools core version for the command scheduler
 (see #5195).

diff --git a/system/modules/core/library/Contao/String.php b/system/modules/core/library/Contao/String.php
@@ -278,7 +278,7 @@ public static function censor($strString, $varWords, $strReplace='')
 	public static function encodeEmail($strString)
 	{
 		$arrEmails = array();
-		preg_match_all('/\w[-._\w]*\w@\w[-._\w]*\w\.\w{2,6}/', $strString, $arrEmails);
+		preg_match_all('/\w([-._\w]*\w)?@\w([-._\w]*\w)?\.\w{2,6}/', $strString, $arrEmails);
 
 		foreach ((array) $arrEmails[0] as $strEmail)
 		{