From: Matt S Trout <mst@shadowcat.co.uk>
Date: Mon, 17 Jul 2006 02:35:46 +0000 (+0000)
Subject: minor fixup to _merge_attr
X-Git-Tag: v0.07002~75^2~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4d1b6d190338e61afdd84237865a006b89e57756;p=dbsrgits%2FDBIx-Class.git

minor fixup to _merge_attr
---

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 82109c9..c71043b 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -1568,7 +1568,8 @@ sub _resolved_attrs {
 
 sub _merge_attr {
   my ($self, $a, $b) = @_;
-  return $b unless $a;
+  return $b unless defined($a);
+  return $a unless defined($b);
   
   if (ref $b eq 'HASH' && ref $a eq 'HASH') {
     foreach my $key (keys %{$b}) {