X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FManyToMany.pm;h=c5884198006a2565c0e5940b43f4f1ee114e1f75;hb=13523f299f81871f7c33fb2e662fc2b5b009f9d2;hp=6e507c7860dd5b9d1a04a693bad54ab3bbab0cb0;hpb=a126983e43f896c64e0ae7ba01c8a3d690d8125a;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/ManyToMany.pm b/lib/DBIx/Class/Relationship/ManyToMany.pm
index 6e507c7..c588419 100644
--- a/lib/DBIx/Class/Relationship/ManyToMany.pm
+++ b/lib/DBIx/Class/Relationship/ManyToMany.pm
@@ -135,10 +135,10 @@ EOW
       my $cond = $rel_source->relationship_info($f_rel)->{cond};
       my $link_cond;
       if (ref $cond eq 'CODE') {
-        my ($cond1, $cond2) = $rel_source->_resolve_condition
+        my ($cond_should_join, $cond_optimized) = $rel_source->_resolve_condition
           ($cond, $obj, $f_rel);
-        if ($cond2) {
-          $link_cond = $cond2;
+        if ($cond_optimized) {
+          $link_cond = $cond_optimized;
         } else {
           $self->throw_exception('Extended relationship '.$rel.
                                  ' requires optimized version for ManyToMany.');