oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change how the query is persisted in Wiki search results. Fixes bug #11558.

Browse source
This commit is contained in:
Colin Kuskie 2010-05-10 13:22:35 -07:00
parent c11d195b21
commit f3d95f99b4
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -6,6 +6,7 @@
- fixed #11544: VersionTag Workflows with missing Version Tags run forever
- fixed #11555: Wiki subcategories entry field is not labeled
- fixed: UserList asset has SQL injection bug
- fixed #11558: wiki results for visitors
7.9.4
- We're shipping underscore.js now for its suite of extremely handy utility

8
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -970,19 +970,13 @@ sub www_search {
wikiHomeUrl=>$self->getUrl,
addPageUrl=>$self->getUrl("func=add;class=WebGUI::Asset::WikiPage;title=".$queryString),
};
if (defined $queryString) {
$self->session->scratch->set('wikiSearchQueryString', $queryString);
}
else {
$queryString = $self->session->scratch->get('wikiSearchQueryString');
}
$self->appendSearchBoxVars($var, $queryString);
if (length $queryString) {
my $search = WebGUI::Search->new($self->session);
$search->search({ keywords => $queryString,
lineage => [$self->get('lineage')],
classes => ['WebGUI::Asset::WikiPage'] });
my $rs = $search->getPaginatorResultSet($self->getUrl("func=search"));
my $rs = $search->getPaginatorResultSet($self->getUrl("func=search;query=".$queryString));
$rs->appendTemplateVars($var);
my @results = ();
foreach my $row (@{$rs->getPageData}) {