Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Quote the search query in the paginator. Fixes bug #12378.
  • Loading branch information
perlDreamer committed Aug 18, 2012
1 parent 4c31d18 commit 83227bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
7.10.26
- fixed: Template diagnostics when called without a session asset.
- fixed: #12378 Wiki search does not work with some metacharacters

7.10.25
- fixed: #12373: Asset::Wobject::Search::view() so HTML highlite not broken by search phrase with unmatched char pairs
Expand Down
1 change: 1 addition & 0 deletions docs/credits.txt
Expand Up @@ -49,6 +49,7 @@ Contributing Developers..............C.J. Adams-Collier / <cjac@colliertech.org>
Colin Kuskie / perlDreamer Consulting LLC
Christophe Marcant
Kristi McCombs / Plain Black
Vince Liao (Global NOC at IU)
Tony Mountifield
Kaleb Murphy / Plain Black
Chris Nehren / Plain Black
Expand Down
2 changes: 1 addition & 1 deletion lib/WebGUI/Asset/Wobject/WikiMaster.pm
Expand Up @@ -998,7 +998,7 @@ sub www_search {
$search->search({ keywords => $queryString,
lineage => [$self->get('lineage')],
classes => ['WebGUI::Asset::WikiPage'] });
my $rs = $search->getPaginatorResultSet($self->getUrl("func=search;query=".$queryString));
my $rs = $search->getPaginatorResultSet($self->getUrl("func=search;query=".$self->session->url->escape($queryString)));
$rs->appendTemplateVars($var);
my @results = ();
foreach my $row (@{$rs->getPageData}) {
Expand Down

0 comments on commit 83227bd

Please sign in to comment.