Bug 328436: Move BugInGroupId from globals.pl to process_bug.cgi

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=wicked, a=justdave

diff --git a/globals.pl b/globals.pl
index b9b6e02d5a874a2fb3efacefdc1b503788cc95a1..7242415e436970560eb13356b560925647d52ca1 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -487,18 +487,6 @@ sub get_legal_field_values {
     return @$result_ref;
 }
 
-sub BugInGroupId {
-    my ($bugid, $groupid) = (@_);
-    PushGlobalSQLState();
-    SendSQL("SELECT CASE WHEN bug_id != 0 THEN 1 ELSE 0 END
-            FROM bug_group_map
-            WHERE bug_id = $bugid
-            AND group_id = $groupid");
-    my $bugingroup = FetchOneColumn();
-    PopGlobalSQLState();
-    return $bugingroup;
-}
-
 sub GroupIdToName {
     my ($groupid) = (@_);
     PushGlobalSQLState();

diff --git a/process_bug.cgi b/process_bug.cgi
index 345bce5922d7b215e157b2e05fcf2cab3e7a1a57..d37ec5231674f523f455d073387397f4b89ca65e 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -85,6 +85,21 @@ my $vars = {};
 
 my $requiremilestone = 0;
 
+######################################################################
+# Subroutines
+######################################################################
+
+sub BugInGroupId {
+    my ($bug_id, $group_id) = @_;
+    detaint_natural($bug_id);
+    detaint_natural($group_id);
+    my ($in_group) = Bugzilla->dbh->selectrow_array(
+        "SELECT CASE WHEN bug_id != 0 THEN 1 ELSE 0 END
+           FROM bug_group_map
+          WHERE bug_id = ? AND group_id = ?", undef, ($bug_id, $group_id));
+    return $in_group;
+}
+
 ######################################################################
 # Begin Data/Security Validation
 ######################################################################