From 5bbfe27f3597b7af871211b06b179506fffc1f94 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 28 Dec 2011 18:23:10 -0800
Subject: [PATCH] Drop the requirement for checking the status of users to be
 listed when no status check has been asked for.

---
 lib/WebGUI/Operation/User.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index ab8c38973..9915b755f 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -211,11 +211,9 @@ sub doUserSearch {
 	my $returnPaginator = shift;
 	my $userFilter = shift;
 	push(@{$userFilter},0);
-	my $selectedStatus;
+	my $selectedStatus = '';
 	if ($session->scratch->get("userSearchStatus")) {
-		$selectedStatus = "status='".$session->scratch->get("userSearchStatus")."'";
-	} else {
-		$selectedStatus = "status like '%'";
+		$selectedStatus = "status='".$session->scratch->get("userSearchStatus")."' and ";
 	}
 	my $keyword = $session->scratch->get("userSearchKeyword");
 	if ($session->scratch->get("userSearchModifier") eq "startsWith") {
@@ -227,7 +225,7 @@ sub doUserSearch {
 	}
 	my $sql = "select users.userId, users.username, users.status, users.dateCreated, users.lastUpdated,
                 users.email from users 
-                where $selectedStatus  and (users.username like ? or alias like ? or email like ? 
+                where $selectedStatus (users.username like ? or alias like ? or email like ? 
                     or firstName like ? or lastName like ? or CONCAT(firstName, ' ', lastName) LIKE ? ) 
                 and users.userId not in (".$session->db->quoteAndJoin($userFilter).")  order by users.username";
 	if ($returnPaginator) {