summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2014-10-27 15:31:20 +0100
committerAndreas Gohr <andi@splitbrain.org>2014-10-27 15:31:20 +0100
commit8b34916885f5b18154f9b1873dcbcc7a12237960 (patch)
tree413de17d86dab2f890fe010fe63cd73978fccb66 /inc
parent6150ae6b14568313e947c9558541bcab71491c1b (diff)
parent8838b30bde9771aec64facd9c61cd53d4dcfc3a0 (diff)
downloadrpg-8b34916885f5b18154f9b1873dcbcc7a12237960.tar.gz
rpg-8b34916885f5b18154f9b1873dcbcc7a12237960.tar.bz2
Merge pull request #907 from Rillke/master
Accept some new gTLD e-Mail addresses
Diffstat (limited to 'inc')
-rw-r--r--inc/mail.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/mail.php b/inc/mail.php
index 9994ac63e..9f1b1f3d6 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -27,7 +27,7 @@ if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
* Check if a given mail address is valid
*/
if (!defined('RFC2822_ATEXT')) define('RFC2822_ATEXT',"0-9a-zA-Z!#$%&'*+/=?^_`{|}~-");
-if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,4}|museum|travel)');
+if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,63})');
/**
* Prepare mailfrom replacement patterns