From ae69ad5447de722c68c7a85bc0d35645b5f1cccd Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 29 Oct 2014 17:33:21 -0400
Subject: Bug 1090175 - Backport upstream bug 1083258 (fix single value select
 elements) r=dkl

---
 Bugzilla/Bug.pm                        | 5 +++++
 template/en/default/bug/edit.html.tmpl | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 90a9f96bb..7d47e9bb5 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3895,6 +3895,11 @@ sub choices {
     my @resolutions = grep($_->name, @{ $resolution_field->legal_values });
     $choices{'resolution'} = \@resolutions;
 
+    foreach my $key (keys %choices) {
+        my $name = $self->$key;
+        $choices{$key} = [grep { $_->is_active || $_->name eq $name } @{ $choices{$key} }];
+    }
+
     $self->{'choices'} = \%choices;
     return $self->{'choices'};
 }
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9b039693a..4ccf2a0a2 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -1250,7 +1250,6 @@
       <input type="hidden" id="[% selname %]_dirty">
       <select id="[% selname %]" name="[% selname %]">
         [% FOREACH x = bug.choices.${selname} %]
-          [% NEXT IF NOT x.is_active AND x.name != bug.${selname} %]
           <option value="[% x.name FILTER html %]"
             [% " selected" IF x.name == bug.${selname} %]>
             [%- x.name FILTER html %]
-- 
cgit v1.2.3-24-g4f1b