Fix link before a closed tag

Author: asika32764

src/Autolink.php

@@ -72,7 +72,7 @@ public function convert($text, $attribs = array())
 	{
 		$self = $this;
 
-		echo $regex = "/(([a-zA-Z]*=\")*(" . $this->getSchemes(true) . ")\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?)/";
+		$regex = "/(([a-zA-Z]*=\")*(" . $this->getSchemes(true) . ")\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}([\/a-zA-Z0-9\-._~:?#\[\]@!$&'()*+,;=%\">]*)?)/";
 
 		return preg_replace_callback(
 			$regex,

test/AutolinkTest.php

@@ -94,7 +94,7 @@ public function testConvert()
 <a href="http://example.com/path?foo[1]=a&foo[2]=b">http://example.com/path?foo[1]=a&foo[2]=b</a>
 <img src="http://example.com/path?foo[1]=a&foo[2]=b" width="100"/>
 <div data-target="http://example.com/path?foo[1]=a&foo[2]=b" wdith="100"/></div>
-<p>http://example.com/path?foo[1]=a&foo[2]=b</p>
+<p><a href="http://example.com/path?foo[1]=a&amp;foo[2]=b">http://example.com/path?foo[1]=a&amp;foo[2]=b</a></p>
 
 HTML;
 
@@ -258,6 +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). 
 TEXT;
 
 		$html = <<<HTML