Bug 285533: Bugzilla displays inactive enum values

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

webtools/bugzilla/checksetup.pl

@@ -1756,8 +1756,8 @@ sub PopulateEnumTable ($@) {
 @my_severities = ('blocker','critical','major','normal','minor',
                  'trivial','enhancement') if !@my_severities;
 @my_priorities = ("P1","P2","P3","P4","P5") if !@my_priorities;
-@my_opsys = ("---","All","Windows","Mac OS","Linux","Other") if !@my_opsys;
-@my_platforms = ("---","All","PC","Macintosh","Other") if !@my_platforms;
+@my_opsys = ("All","Windows","Mac OS","Linux","Other") if !@my_opsys;
+@my_platforms = ("All","PC","Macintosh","Other") if !@my_platforms;
 
 PopulateEnumTable('bug_severity', @my_severities);
 PopulateEnumTable('priority', @my_priorities);

webtools/bugzilla/globals.pl

@@ -962,7 +962,9 @@ sub get_legal_field_values {
     my ($field) = @_;
     my $dbh = Bugzilla->dbh;
     my $result_ref = $dbh->selectcol_arrayref(
-                           "SELECT value FROM $field ORDER BY sortkey, value");
+         "SELECT value FROM $field
+           WHERE isactive = ?
+        ORDER BY sortkey, value", undef, (1));
     return @$result_ref;
 }