From 28eabdd9979cbe0bffea6e596a106ec9f6ecff01 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 7 Jun 2010 08:25:14 -0700
Subject: [PATCH] Remove some dead code from the UserList wobject.  Fixes bug
 #11605

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 874815647..e0f674ec3 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -6,6 +6,7 @@
  - fixed: The template form plugin would return an empty string when getValueAsHtml was called. ( Martin Kamerbeek / Oqapi )
  - fixed #11611: Thingy: The add field pop up box has multiple "Text" field types
  - fixed #11610: Bad hover help for CS sortBy field
+ - fixed #11605: UserList refers to non-existent "publicEmail" user profiling field
 
 7.9.6
  - new checkbox in the asset manager for clearing the package flag on import
diff --git a/lib/WebGUI/Asset/Wobject/UserList.pm b/lib/WebGUI/Asset/Wobject/UserList.pm
index 3466965ff..122c03b4b 100644
--- a/lib/WebGUI/Asset/Wobject/UserList.pm
+++ b/lib/WebGUI/Asset/Wobject/UserList.pm
@@ -363,7 +363,7 @@ sub view {
     my $url = $self->session->url;
 	my $i18n = WebGUI::International->new($self->session, "Asset_UserList");
 	my (%var, @users, @profileField_loop, @profileFields);
-	my ($defaultPublicProfile, $defaultPublicEmail, $user, $sth, $sql, $profileField);
+	my ($user, $sth, $sql, $profileField);
 
     my $currentUrlWithoutSort = $self->getUrl();
     foreach ($form->param) {
@@ -518,9 +518,6 @@ sub view {
     $sortBy = join '.', map { $self->session->db->quoteIdentifier($_) } split /\./, $sortBy;
 	$sql .= " order by ".$sortBy." ".$sortOrder;
 
-	($defaultPublicProfile) = $self->session->db->quickArray("SELECT dataDefault FROM userProfileField WHERE fieldName='publicProfile'");
-	($defaultPublicEmail) = $self->session->db->quickArray("SELECT dataDefault FROM userProfileField WHERE fieldName='publicEmail'");
-
 	my $paginatePage = $form->param('pn') || 1;
 	my $currentUrl = $self->getUrl();
 	foreach ($form->param) {