From 0587d2802696193ba017a7494bf5148341e2cb82 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 6 Apr 2007 21:48:25 +0000
Subject: [PATCH] fix defined variable problems interfering with session
 scratch variables in the user search/list operation

---
 docs/changelog/7.x.x.txt     | 2 ++
 lib/WebGUI/Operation/User.pm | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 521262892..810be8b82 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,8 @@
  - fix: Event Management System -- No longer uses session scratch to save
         purchase information, which breaks things when a user logs out before 
         they complete their transaction.
+ - fix: Trouble with Search Users (perlDreamer Consulting, LLC)
+        http://www.plainblack.com/bugs/tracker/trouble-with-search-users
 
 
 7.3.14
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 05ada27e9..f739db605 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -182,9 +182,9 @@ sub getUserSearchForm {
 	my $op = shift;
 	my $params = shift;
 	my $noStatus = shift;
-	$session->scratch->set("userSearchKeyword",$session->form->process("keyword")) if $session->form->process("keyword");
-	$session->scratch->set("userSearchStatus",$session->form->process("status")) if $session->form->process("status");
-	$session->scratch->set("userSearchModifier",$session->form->process("modifier")) if $session->form->process("modifier");
+	$session->scratch->set("userSearchKeyword",$session->form->process("keyword")) if defined($session->form->process("keyword"));
+	$session->scratch->set("userSearchStatus",$session->form->process("status")) if defined($session->form->process("status"));
+	$session->scratch->set("userSearchModifier",$session->form->process("modifier")) if defined($session->form->process("modifier"));
 	my $i18n = WebGUI::International->new($session);
 	my $output = '<div align="center">'
 		.WebGUI::Form::formHeader($session,)
@@ -536,7 +536,7 @@ sub www_formUsers {
 	$session->http->setCacheControl("none");
 	return $session->privilege->insufficient() unless $session->user->isInGroup(12);
 	$session->style->useEmptyStyle("1");
-my $output = getUserSearchForm($session,"formUsers",{formId=>$session->form->process("formId")},1);
+    my $output = getUserSearchForm($session,"formUsers",{formId=>$session->form->process("formId")},1);
 	my ($userCount) = $session->db->quickArray("select count(*) from users");
 	return $output unless ($session->form->process("doit") || $userCount<250 || $session->form->process("pn") > 1);
 	$output .= '<ul>';