Fix Issue with email linking between () #5

asika32764 · asika32764 · commit 5e509862bac9 · 2016-06-28T12:12:02.000+08:00
diff --git a/src/Autolink.php b/src/Autolink.php
@@ -103,7 +103,7 @@ public function convertEmail($text, $attribs = array())
 	{
 		$self = $this;
 		
-		$regex = "/(([a-zA-Z]*=\")*\S+@\S+\.\S+)/";
+		$regex = "/(([a-zA-Z]*=\")*[a-zA-Z0-9!#$%&'*+-\/=?^_`{|}~:]+@[a-zA-Z0-9!#$%&'*+-\/=?^_`{|}~\">]+)/";
 
 		return preg_replace_callback(
 			$regex,
diff --git a/test/AutolinkTest.php b/test/AutolinkTest.php
@@ -258,7 +258,7 @@ public function testConvertEmail()
 <div data-target="sakura@flower.com" wdith="100"/></div>
 <div data-target="mailto:sakura@flower.com" wdith="100"/></div>
 
-and emails are coming in between(salsan@lt.com). 
+and emails are coming in between(sakura@flower.com). 
 TEXT;
 
 		$html = <<<HTML
@@ -273,6 +273,7 @@ public function testConvertEmail()
 <div data-target="sakura@flower.com" wdith="100"/></div>
 <div data-target="mailto:sakura@flower.com" wdith="100"/></div>
 
+and emails are coming in between(<a href="mailto:sakura@flower.com">sakura@flower.com</a>).
 HTML;
 
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function convertEmail($text, $attribs = array())`
`103`	`103`	`{`
`104`	`104`	`$self = $this;`
`105`	`105`
`106`		`- $regex = "/(([a-zA-Z]=\")\S+@\S+\.\S+)/";`
	`106`	+ $regex = "/(([a-zA-Z]=\")[a-zA-Z0-9!#$%&'+-\/=?^_`{\|}~:]+@[a-zA-Z0-9!#$%&'+-\/=?^_`{\|}~\">]+)/";
`107`	`107`
`108`	`108`	`return preg_replace_callback(`
`109`	`109`	`$regex,`