Merge branch 'master' of github.com:asika32764/php-autolink

Author: asika32764

README.md

@@ -190,7 +190,7 @@ Output
 
 ## Scheme
 
-You can add new scheme to convert URL begin with it, foe example: `vnc://example.com`
+You can add new scheme to convert URL begin with it, for example: `vnc://example.com`
 
 ``` php
 $autolink->addScheme('skype')
@@ -208,7 +208,7 @@ $autolink->setLinkBuilder(function($url, $attribs)
 {
     $attribs['src'] = htmlspecialchars($url);
 
-    return (string) \Windwalker\Html\HtmlElement('img', null, $attribs);
+    return (string) new \Windwalker\Html\HtmlElement('img', null, $attribs);
 });
 ```
 

src/Autolink.php

@@ -78,7 +78,7 @@ public function convert($text, $attribs = array())
 			$regex,
 			function($matches) use ($self, $attribs)
 			{
-				preg_match('/[a-zA-Z]*\=\"(.*)\"/', $matches[0], $inElements);
+				preg_match('/[a-zA-Z]*\=\"(.*)/', $matches[0], $inElements);
 
 				if (!$inElements)
 				{
@@ -101,19 +101,21 @@ function($matches) use ($self, $attribs)
 	 */
 	public function convertEmail($text, $attribs = array())
 	{
+		$self = $this;
+		
 		$regex = "/(([a-zA-Z]*=\")*\S+@\S+\.\S+)/";
 
 		return preg_replace_callback(
 			$regex,
-			function($matches) use ($attribs)
+			function($matches) use ($self, $attribs)
 			{
-				preg_match('/[a-zA-Z]*\=\"(.*)\"/', $matches[0], $inElements);
+				preg_match('/[a-zA-Z]*\=\"(.*)/', $matches[0], $inElements);
 
 				if (!$inElements)
 				{
 					$attribs['href'] = 'mailto:' . htmlspecialchars($matches[0]);
 
-					return $this->buildLink($matches[0], $attribs);
+					return $self->buildLink($matches[0], $attribs);
 				}
 
 				return $matches[0];