Fixed URL matching with double dashes in hostname

This commit is contained in:
Savetheinternet 2011-01-02 22:16:18 +11:00
parent 7ae3678554
commit 6bbe658370

View File

@ -285,6 +285,8 @@
function markup(&$body) { function markup(&$body) {
global $board; global $board;
$body = utf8tohtml($body, true);
if(MARKUP_URLS) if(MARKUP_URLS)
$body = preg_replace(URL_REGEX, "<a href=\"$0\">$0</a>", $body); $body = preg_replace(URL_REGEX, "<a href=\"$0\">$0</a>", $body);
@ -299,8 +301,6 @@
$body = str_replace('--', '', $body); // en dash $body = str_replace('--', '', $body); // en dash
} }
$body = utf8tohtml($body, true);
// Cites // Cites
if(preg_match_all('/(^|\s)&gt;&gt;([0-9]+?)(\s|$)/', $body, $cites)) { if(preg_match_all('/(^|\s)&gt;&gt;([0-9]+?)(\s|$)/', $body, $cites)) {
$previousPosition = 0; $previousPosition = 0;