kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Don't auto-unicode on links

Browse Source
This commit is contained in:
Michael Save 2012-01-31 05:57:25 +11:00
parent 16f2d47813
commit 4706ef8789
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
inc/functions.php
View File

@ -1306,6 +1306,8 @@
} }
function markup_url($matches) { function markup_url($matches) {
global $markup_urls;
$url = $matches[0]; $url = $matches[0];
$after = ''; $after = '';
@ -1314,11 +1316,27 @@
$after = $match[1]; $after = $match[1];
} }
$markup_urls[] = $url;
return '<a target="_blank" rel="nofollow" href="' . $url . '">' . $url . '</a>' . $after; return '<a target="_blank" rel="nofollow" href="' . $url . '">' . $url . '</a>' . $after;
} }
function unicodify($body) {
$body = str_replace('...', '&hellip;', $body);
$body = str_replace('&lt;--', '&larr;', $body);
$body = str_replace('--&gt;', '&rarr;', $body);
// En and em- dashes are rendered exactly the same in
// most monospace fonts (they look the same in code
// editors).
$body = str_replace('---', '&ndash;', $body); // em dash
$body = str_replace('--', '&mdash;', $body); // en dash
return $body;
}
function markup(&$body, $track_cites = false) { function markup(&$body, $track_cites = false) {
global $board, $config; global $board, $config, $markup_urls;
$body = utf8tohtml($body); $body = utf8tohtml($body);
@ -1330,21 +1348,19 @@
} }
if($config['markup_urls']) { if($config['markup_urls']) {
$markup_urls = Array();
$body = preg_replace_callback($config['url_regex'], 'markup_url', $body, -1, $num_links); $body = preg_replace_callback($config['url_regex'], 'markup_url', $body, -1, $num_links);
if($num_links > $config['max_links']) if($num_links > $config['max_links'])
error($config['error']['toomanylinks']); error($config['error']['toomanylinks']);
}//exit; }
if($config['auto_unicode']) { if($config['auto_unicode']) {
$body = str_replace('...', '&hellip;', $body); $body = unicodify($body);
$body = str_replace('&lt;--', '&larr;', $body);
$body = str_replace('--&gt;', '&rarr;', $body);
// En and em- dashes are rendered exactly the same in foreach($markup_urls as &$url) {
// most monospace fonts (they look the same in code $body = str_replace(unicodify($url), $url, $body);
// editors). }
$body = str_replace('---', '&ndash;', $body); // em dash
$body = str_replace('--', '&mdash;', $body); // en dash
} }
// replace tabs with 8 spaces // replace tabs with 8 spaces