PyukiWiki CVS Commit
pyuki****@lists*****
2012年 2月 25日 (土) 21:21:43 JST
Index: PyukiWiki-Devel-UTF8/plugin/search.inc.pl diff -u PyukiWiki-Devel-UTF8/plugin/search.inc.pl:1.290 PyukiWiki-Devel-UTF8/plugin/search.inc.pl:1.291 --- PyukiWiki-Devel-UTF8/plugin/search.inc.pl:1.290 Wed Feb 22 11:51:07 2012 +++ PyukiWiki-Devel-UTF8/plugin/search.inc.pl Sat Feb 25 21:21:43 2012 @@ -1,6 +1,6 @@ ###################################################################### # search.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: search.inc.pl,v 1.290 2012/02/22 02:51:07 papu Exp $ +# $Id: search.inc.pl,v 1.291 2012/02/25 12:21:43 papu Exp $ # # "PyukiWiki" version 0.2.0-p2-preview4 $$ # Author: Nekyo http://nekyo.qp.land.to/ @@ -98,8 +98,11 @@ my $counter = 0; foreach my $page (sort keys %found) { $body .= qq|<ul>| if ($counter == 0); - $body .= qq(<li><a href ="$::script?cmd=read&mypage=@{[&encode($page)]}&word=@{[&encode($word)]}">@{[&htmlspecialchars($page)]}</a>@{[&htmlspecialchars(&get_subjectline($page))]}</li>); -# $body .= qq(<li><a href ="$::script?@{[&encode($page)]}">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</li>); + if($::use_Highlight eq 1) { + $body .= qq(<li><a href ="$::script?cmd=read&mypage=@{[&encode($page)]}&word=@{[&encode($word)]}">@{[&htmlspecialchars($page)]}</a>@{[&htmlspecialchars(&get_subjectline($page))]}</li>); + } else { + $body .= qq(<li><a href ="$::script?@{[&encode($page)]}">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</li>); + } $counter++; } $body .= ($counter == 0) ? $::resource{notfound} : qq|</ul>|; Index: PyukiWiki-Devel-UTF8/plugin/search_fuzzy.inc.pl diff -u PyukiWiki-Devel-UTF8/plugin/search_fuzzy.inc.pl:1.291 PyukiWiki-Devel-UTF8/plugin/search_fuzzy.inc.pl:1.292 --- PyukiWiki-Devel-UTF8/plugin/search_fuzzy.inc.pl:1.291 Wed Feb 22 11:51:07 2012 +++ PyukiWiki-Devel-UTF8/plugin/search_fuzzy.inc.pl Sat Feb 25 21:21:43 2012 @@ -1,6 +1,6 @@ ###################################################################### # search_fuzzy.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: search_fuzzy.inc.pl,v 1.291 2012/02/22 02:51:07 papu Exp $ +# $Id: search_fuzzy.inc.pl,v 1.292 2012/02/25 12:21:43 papu Exp $ # # "PyukiWiki" version 0.2.0-p2-preview4 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -88,8 +88,11 @@ my $counter = 0; foreach my $page (sort keys %found) { $body .= qq|<ul>| if ($counter == 0); - $body .= qq(<li><a href ="$::script?cmd=read&mypage=@{[&encode($page)]}&word=@{[&encode($word)]}">@{[&htmlspecialchars($page)]}</a>@{[&htmlspecialchars(&get_subjectline($page))]}</li>); -# $body .= qq(<li><a href ="$::script?@{[&htmlspecialchars(&encode($page))]}">@{[&htmlspecialchars($page)]}</a>@{[&htmlspecialchars(&get_subjectline($page))]}</li>); + if($::use_Highlight eq 1) { + $body .= qq(<li><a href ="$::script?cmd=read&mypage=@{[&encode($page)]}&word=@{[&encode($word)]}">@{[&htmlspecialchars($page)]}</a>@{[&htmlspecialchars(&get_subjectline($page))]}</li>); + } else { + $body .= qq(<li><a href ="$::script?@{[&htmlspecialchars(&encode($page))]}">@{[&htmlspecialchars($page)]}</a>@{[&htmlspecialchars(&get_subjectline($page))]}</li>); + } $counter++; } $body .= ($counter == 0) ? $::resource{notfound} : qq|</ul>|;
