# HG changeset patch
# User Dan Fuhry <dan@enanocms.org>
# Date 1286939247 14400
# Node ID e00489a30c729f7e8fcd4ccc83ab00255235bf1a
# Parent  ba8a648baebc60ecdf78a0b07e589dee842ac139
Fixed a rather major bug with the external link parser: two links in one line now handled gracefully.

diff -r ba8a648baebc -r e00489a30c72 includes/wikiengine/parse_mediawiki.php
--- a/includes/wikiengine/parse_mediawiki.php	Fri Sep 24 21:50:25 2010 -0400
+++ b/includes/wikiengine/parse_mediawiki.php	Tue Oct 12 23:07:27 2010 -0400
@@ -17,8 +17,8 @@
 		'bold'   => "/'''(.+?)'''/",
 		'italic' => "/''(.+?)''/",
 		'underline' => '/__(.+?)__/',
-		'externalwithtext' => '#\[((?:https?|irc|ftp)://.+?) (.+?)\]#',
-		'externalnotext' => '#\[((?:https?|irc|ftp)://.+?)\]#',
+		'externalwithtext' => '#\[((?:https?|irc|ftp)://[^ ]+?) (.+?)\]#',
+		'externalnotext' => '#\[((?:https?|irc|ftp)://[^ ]+?)\]#',
 		'mailtonotext' => '#\[mailto:([^ \]]+?)\]#',
 		'mailtowithtext' => '#\[mailto:([^ \]]+?) (.+?)\]#',
 		'hr' => '/^[-]{4,} *$/m',
diff -r ba8a648baebc -r e00489a30c72 includes/wikiformat.php
--- a/includes/wikiformat.php	Fri Sep 24 21:50:25 2010 -0400
+++ b/includes/wikiformat.php	Tue Oct 12 23:07:27 2010 -0400
@@ -70,8 +70,8 @@
 			'italic',
 			'underline',
 			'image',
+			'externalnotext',
 			'externalwithtext',
-			'externalnotext',
 			'mailtowithtext',
 			'mailtonotext',
 			'internallink',