Skip to content

Commit 83227bd

Browse files
committedAug 18, 2012
Quote the search query in the paginator. Fixes bug #12378.

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed
 

‎docs/changelog/7.x.x.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
7.10.26
22
- fixed: Template diagnostics when called without a session asset.
3+
- fixed: #12378 Wiki search does not work with some metacharacters
34

45
7.10.25
56
- fixed: #12373: Asset::Wobject::Search::view() so HTML highlite not broken by search phrase with unmatched char pairs

‎docs/credits.txt

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Contributing Developers..............C.J. Adams-Collier / <cjac@colliertech.org>
4949
Colin Kuskie / perlDreamer Consulting LLC
5050
Christophe Marcant
5151
Kristi McCombs / Plain Black
52+
Vince Liao (Global NOC at IU)
5253
Tony Mountifield
5354
Kaleb Murphy / Plain Black
5455
Chris Nehren / Plain Black

‎lib/WebGUI/Asset/Wobject/WikiMaster.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ sub www_search {
998998
$search->search({ keywords => $queryString,
999999
lineage => [$self->get('lineage')],
10001000
classes => ['WebGUI::Asset::WikiPage'] });
1001-
my $rs = $search->getPaginatorResultSet($self->getUrl("func=search;query=".$queryString));
1001+
my $rs = $search->getPaginatorResultSet($self->getUrl("func=search;query=".$self->session->url->escape($queryString)));
10021002
$rs->appendTemplateVars($var);
10031003
my @results = ();
10041004
foreach my $row (@{$rs->getPageData}) {

0 commit comments

Comments
 (0)
Please sign in to comment.