From 6bbe6583706f7c231072f7157a29f55b28a905c7 Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Sun, 2 Jan 2011 22:16:18 +1100
Subject: [PATCH] Fixed URL matching with double dashes in hostname

---
 inc/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 54e3a287..bdb8298c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -285,9 +285,11 @@
 	function markup(&$body) {
 		global $board;
 		
+		$body = utf8tohtml($body, true);
+		
 		if(MARKUP_URLS)
 			$body = preg_replace(URL_REGEX, "<a href=\"$0\">$0</a>", $body);
-		
+			
 		if(AUTO_UNICODE) {
 			$body = str_replace('...', '…', $body);
 			$body = str_replace('<--', '←', $body);
@@ -299,8 +301,6 @@
 			$body = str_replace('--', '–', $body); // en dash
 		}
 
-		$body = utf8tohtml($body, true);
-
 		// Cites
 		if(preg_match_all('/(^|\s)&gt;&gt;([0-9]+?)(\s|$)/', $body, $cites)) {
 			$previousPosition = 0;