--- 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',