From: Dave Mitchell <davem@fdisolutions.com>
Date: Sun, 5 Sep 2004 20:16:55 +0000 (+0000)
Subject: I somehow managed to omit the base.pm change from #23266
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=446e776fb7618d56ecd9043c4060e08967abe22c;p=p5sagit%2Fp5-mst-13.2.git

I somehow managed to omit the base.pm change from #23266

p4raw-id: //depot/perl@23267
---

diff --git a/lib/base.pm b/lib/base.pm
index e98d0f1..832b6a4 100644
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -152,10 +152,9 @@ sub inherit_fields {
         }
     }
 
-    unless( keys %$bfields ) {
-        foreach my $idx (1..$#{$battr}) {
-            $dattr->[$idx] = $battr->[$idx] & INHERITED;
-        }
+    foreach my $idx (1..$#{$battr}) {
+	next if defined $dattr->[$idx];
+	$dattr->[$idx] = $battr->[$idx] & INHERITED;
     }
 }