From: <sy...@us...> - 2005-01-11 19:31:02
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10349/lib Modified Files: Tag: BRANCH-1-9 tikilib.php Log Message: a quote before a hotword (ex: L'Est Republicain) Index: tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.514.2.107 retrieving revision 1.514.2.108 diff -u -d -r1.514.2.107 -r1.514.2.108 --- tikilib.php 9 Jan 2005 12:45:53 -0000 1.514.2.107 +++ tikilib.php 11 Jan 2005 19:30:43 -0000 1.514.2.108 @@ -3969,8 +3969,8 @@ if ($feature_hotwords == 'y') { foreach ($words as $word => $url) { // \b is a word boundary, \s is a space char - $line = preg_replace("/(=(\"|')[^\"']*[ \n\t\r\,\;])$word([ \n\t\r\,\;][^\"']*(\"|'))/i","$1:::::$word,:::::$3",$line); - $line = preg_replace("/([ \n\t\r\,\;]|^)$word($|[ \n\t\r\,\;])/i","$1<a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$2",$line); + $line = preg_replace("/(=(\"|')[^\"']*[ \n\t\r\,\;'])$word([ \n\t\r\,\;][^\"']*(\"|'))/i","$1:::::$word,:::::$3",$line); + $line = preg_replace("/([ \n\t\r\,\;']|^)$word($|[ \n\t\r\,\;])/i","$1<a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$2",$line); $line = preg_replace("/:::::$word,:::::/i","$word",$line); } } |