- Fix regular expression for e-mail address (#1486152)

15 years ago · cb9fc852cf
parent 1cead0cbf4
commit cb9fc852cf
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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)
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@ -39,7 +39,7 @@ class rcube_string_replacer
    $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";
  }

  /**