From 83227bd8b72a133f2177aa3e0c3868f1a42bb591 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 18 Aug 2012 12:50:24 -0700
Subject: [PATCH] Quote the search query in the paginator.  Fixes bug #12378.

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 2025fe161..0ff42accf 100644
--- a/docs/changelog/7.x.x.txt
+++ b/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
diff --git a/docs/credits.txt b/docs/credits.txt
index 2d1bfe425..a692375a2 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -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
diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
index 910bc957c..736fa50a7 100644
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@@ -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}) {