Bug 895813: Mandatory custom fields whose visibility depends on a component are not...

r=pketolai r=dkl a=sgreen

diff --git a/Bugzilla/Component.pm b/Bugzilla/Component.pm
index 2b3f48406840418638ce3bcb77329efe1fbab50b..1ce4e02ea36845d858aafcee2535e88b71b11e90 100644 (file)
--- a/Bugzilla/Component.pm
+++ b/Bugzilla/Component.pm
@@ -417,10 +417,10 @@ use constant is_default => 0;
 
 sub is_set_on_bug {
     my ($self, $bug) = @_;
-    # We treat it like a hash always, so that we don't have to check if it's
-    # a hash or an object.
-    return 0 if !defined $bug->{component_id};
-    $bug->{component_id} == $self->id ? 1 : 0;
+    my $value = blessed($bug) ? $bug->component_id : $bug->{component};
+    $value = $value->id if blessed($value);
+    return 0 unless $value;
+    return $value == $self->id ? 1 : 0;
 }
 
 ###############################