properly handling & character as part of the url

Author: Vadim Kazakov

dist/Autolinker.js

@@ -166,8 +166,10 @@
 		 * @property {RegExp} htmlCharacterEntities
 		 *
 		 * The regular expression that matches common HTML character entities.
+		 * 
+		 * Ignoring & as it coule be part of a query string, handling it separately
 		 */
-		htmlCharacterEntities: /( | |<|<|>|>|&|&)/i,
+		htmlCharacterEntities: /( | |<|<|>|>)/i,
 
 		/**
 		 * @private
@@ -1018,7 +1020,8 @@
 		 * @return {String}
 		 */
 		getAnchorHref : function() {
-			return this.getUrl();
+			var url = this.getUrl();
+			return url.replace('&', '&');
 		},
 
 

dist/Autolinker.min.js

@@ -145,8 +145,10 @@ Autolinker.prototype = {
 	 * @property {RegExp} htmlCharacterEntities
 	 *
 	 * The regular expression that matches common HTML character entities.
+	 * 
+	 * Ignoring & as it coule be part of a query string, handling it separately
 	 */
-	htmlCharacterEntities: /( | |<|<|>|>|&|&)/i,
+	htmlCharacterEntities: /( | |<|<|>|>)/i,
 
 	/**
 	 * @private

src/Autolinker.js

@@ -73,7 +73,8 @@ Autolinker.UrlMatch = Autolinker.Util.extend( Autolinker.Match, {
 	 * @return {String}
 	 */
 	getAnchorHref : function() {
-		return this.getUrl();
+		var url = this.getUrl();
+		return url.replace('&', '&');
 	},
 
 

src/UrlMatch.js

@@ -744,6 +744,13 @@ describe( "Autolinker", function() {
 				var result = autolinker.link( html );
 				expect( result ).toBe('<p>Joe went to <a href="http://yahoo.com">yahoo.com</a>&nbsp;and <a href="http://google.com">google.com</a></p>');
 			} );
+			
+			it( "should handle &amp; inside a url and not ignore it", function() {
+				var html = "<p>Joe went to example.com?arg=1&amp;arg=2</p>";
+				
+				var result = autolinker.link( html );
+				expect( result ).toBe('<p>Joe went to <a href="http://example.com?arg=1&arg=2">example.com?arg=1&amp;arg=2</a></p>');
+			} );
 
 		} );