281,296d280
< //
< //Turns a [wiki=pagename]link[/wiki] bbcode into <a href="http://wikibase/pagename">link</a>
< //
< function handle_wiki_tag($pagename, $link = '')
< {
<       global $pun_user;
<
<       $wikiurl = 'http://wiki.archlinux.org/index.php/';
<
<       $full_url = str_replace(' ', '_', $wikiurl.$pagename);
<
<       $link = ($link == '' || $link == $pagename) ? ((strlen($pagename) > 55) ? substr($pagename, 0 , 39).' &hellip; '.substr($pagename, -10) : $pagename) : stripslashes($link);
<
<       return '<a href="'.$full_url.'">'.$link.'</a>';
< }
<
337,339c321
<                                        '#\[color=([a-zA-Z]*|\#?[0-9a-fA-F]{6})](.*?)\[/color\]#s',
<                                        '#\[wiki\]([^\[<]*?)\[/wiki\]#e',
<                                        '#\[wiki=([^\[<]*?)\](.*?)\[/wiki\]#e');
---
>                                        '#\[color=([a-zA-Z]*|\#?[0-9a-fA-F]{6})](.*?)\[/color\]#s');
348,350c330
<                                        '<span style="color: $1">$2</span>',
<                                        'handle_wiki_tag(\'$1\')',
<                                        'handle_wiki_tag(\'$1\', \'$2\')');
---
>                                        '<span style="color: $1">$2</span>');