From f3d95f99b41532995cc4ddf545b7aedc85775dee Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 10 May 2010 13:22:35 -0700
Subject: [PATCH] Change how the query is persisted in Wiki search results. 
 Fixes bug #11558.

---
 docs/changelog/7.x.x.txt               | 1 +
 lib/WebGUI/Asset/Wobject/WikiMaster.pm | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 90fbdb8ca..387892bf6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -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
diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
index a3b381292..4a1d95f00 100644
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@@ -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}) {