From a7ff24865cb8a1fce6484e5d93b6783eef11db9c Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com"
 <lpsolit%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 12 May 2005 19:18:00 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20293901:=20cannot=20specify=20the=20QA=20c?=
 =?UTF-8?q?ontact=20using=20bug=5Femail.pl=20-=20Patch=20by=20Fr=C3=A9d?=
 =?UTF-8?q?=C3=A9ric=20Buclin=20<LpSolit@gmail.com>=20r=3Ddberlin=20a=3Dju?=
 =?UTF-8?q?stdave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@173340 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/contrib/bug_email.pl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/bugzilla/contrib/bug_email.pl b/mozilla/webtools/bugzilla/contrib/bug_email.pl
index 8772ee1861a..0c67832729c 100755
--- a/mozilla/webtools/bugzilla/contrib/bug_email.pl
+++ b/mozilla/webtools/bugzilla/contrib/bug_email.pl
@@ -38,7 +38,7 @@
 #
 # You need to work with bug_email.pl the MIME::Parser installed.
 # 
-# $Id: bug_email.pl,v 1.26 2005-05-12 17:26:26 lpsolit%gmail.com Exp $
+# $Id: bug_email.pl,v 1.27 2005-05-12 19:13:56 lpsolit%gmail.com Exp $
 ###############################################################
 
 # 02/12/2000 (SML)
@@ -827,10 +827,15 @@ if (! CheckPermissions("CreateBugs", $SenderShort ) ) {
 
 # Set QA
 if (Param("useqacontact")) {
-    SendSQL("select initialqacontact from components, products where components.product_id = products.id AND products.name=" .
-            SqlQuote($Control{'product'}) .
-            " and components.name=" . SqlQuote($Control{'component'}));
-    $Control{'qa_contact'} = FetchOneColumn();
+    if (defined($Control{'qa_contact'}) 
+        && $Control{'qa_contact'} !~ /^\s*$/ ) {
+        $Control{'qa_contact'} = DBname_to_id($Control{'qa_contact'});
+    } else {
+        SendSQL("select initialqacontact from components, products where components.product_id = products.id AND products.name=" .
+                SqlQuote($Control{'product'}) .
+                " and components.name=" . SqlQuote($Control{'component'}));
+        $Control{'qa_contact'} = FetchOneColumn();
+    }
 }
 
 # Set Assigned - assigned_to depends on the product, cause initialowner