[Svn] r2984 - in trunk/roundcubemail: . program/include

trac at roundcube.net trac at roundcube.net
Wed Sep 23 19:25:06 CEST 2009


Author: alec
Date: 2009-09-23 12:25:05 -0500 (Wed, 23 Sep 2009)
New Revision: 2984

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/rcube_string_replacer.php
Log:
- Fix regular expression for e-mail address (#1486152)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2009-09-23 12:32:09 UTC (rev 2983)
+++ trunk/roundcubemail/CHANGELOG	2009-09-23 17:25:05 UTC (rev 2984)
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix regular expression for e-mail address (#1486152)
 - Fix Received header format
 - Implemented sorting by message index - added 'index_sort' option (#1485936)
 - Fix dl() use in installer (#1486150)

Modified: trunk/roundcubemail/program/include/rcube_string_replacer.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_string_replacer.php	2009-09-23 12:32:09 UTC (rev 2983)
+++ trunk/roundcubemail/program/include/rcube_string_replacer.php	2009-09-23 17:25:05 UTC (rev 2984)
@@ -39,7 +39,7 @@
     $url_chars_within = '\?\.~,!';
 
     $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/i";
-    $this->mailto_pattern = "/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i";
+    $this->mailto_pattern = "/([a-z0-9][a-z0-9\-\.\+\_]*@([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z]{2,5})/i";
   }
 
   /**

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list