summaryrefslogtreecommitdiff
path: root/inc/functions.php
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@n0v4.com>2011-01-02 22:16:18 +1100
committerSavetheinternet <savetheinternet@n0v4.com>2011-01-02 22:16:18 +1100
commit6bbe6583706f7c231072f7157a29f55b28a905c7 (patch)
tree45096941eb2ff19b13ea74816ae0c5d660824825 /inc/functions.php
parent7ae3678554b049515b398403a04e7ffe87b4f4c0 (diff)
Fixed URL matching with double dashes in hostname
Diffstat (limited to 'inc/functions.php')
-rw-r--r--inc/functions.php6
1 files 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;