Skip to content
Snippets Groups Projects
Commit aef6e87c authored by aydreeihn's avatar aydreeihn
Browse files

Merge remote-tracking branch 'kevin/issue/mailto-tld-length' into features_prs/develop-next

parents 0ddb02a5 1a261690
Branches
Tags
No related merge requests found
...@@ -426,7 +426,7 @@ class Format { ...@@ -426,7 +426,7 @@ class Format {
// Scan for things that look like URLs // Scan for things that look like URLs
return preg_replace_callback( return preg_replace_callback(
'`(?<!>)(((f|ht)tp(s?)://|(?<!//)www\.)([-+~%/.\w]+)(?:[-?#+=&;%@.\w]*)?)' '`(?<!>)(((f|ht)tp(s?)://|(?<!//)www\.)([-+~%/.\w]+)(?:[-?#+=&;%@.\w]*)?)'
.'|(\b[_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,4})`', .'|(\b[_\.0-9a-z-]+@([0-9a-z][0-9a-z-]+\.)+[a-z]{2,63})`',
function ($match) { function ($match) {
if ($match[1]) { if ($match[1]) {
while (in_array(substr($match[1], -1), while (in_array(substr($match[1], -1),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment