From 76ffbd23c186b838d7b1449166c706d192c0dc49 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 24 Dec 2004 05:03:59 +0000
Subject: [PATCH] r22: Changed construct_user_display() to have a hide userid
 option. Changed newreport.php to build the assigned to list via
 construct_user_display().

---
 includes/functions.php | 4 ++--
 newreport.php          | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 7adf980..d090ad4 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -253,10 +253,10 @@ function datelike($format, $timestamp)
 
 // ################### Start construct_user_display ##################
 // $userinfo needs userid, email, displayname, and showemail
-function construct_user_display($userinfo)
+function construct_user_display($userinfo, $userid = true)
 {
 	fetch_user_display_name($userinfo);
-	return "$userinfo[displayname]" . iff($userinfo['showemail'], " &lt;$userinfo[email]&gt;") . " (userid: $userinfo[userid])";
+	return "$userinfo[displayname]" . iff($userinfo['showemail'], " &lt;$userinfo[email]&gt;") . iff($userid, " (userid: $userinfo[userid])");
 }
 
 // ######################## Start can_perform ########################
diff --git a/newreport.php b/newreport.php
index 3beb566..9381ba2 100755
--- a/newreport.php
+++ b/newreport.php
@@ -302,8 +302,7 @@ if ($_REQUEST['do'] == 'add')
 			echo '<div><strong>Assigned to:</strong> <select name="assignedto"><option value="0">No Assignment</option>';
 			foreach ($bugsys->datastore['assignto'] AS $dev)
 			{
-				fetch_user_display_name($dev);
-				echo '<option value="' . $dev['userid'] . '">' . $dev['displayname'] . iff($dev['showemail'], ' <' . $dev['email'] . '>', '') . '</option>';
+				echo '<option value="' . $dev['userid'] . '">' . construct_user_display($dev, 0) . '</option>';
 			}
 			echo '</select></div>';
 		}
-- 
2.22.5