[Bast-commits] r9558 - DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/Relationship

[ruoso at dev.catalyst.perl.org]

Author: ruoso
Date: 2010-06-02 19:00:51 +0100 (Wed, 02 Jun 2010)
New Revision: 9558

Modified:
   DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/Relationship/ManyToMany.pm
Log:
use more descriptive names on variables

Modified: DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/Relationship/ManyToMany.pm
===================================================================
--- DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/Relationship/ManyToMany.pm	2010-06-02 17:41:37 UTC (rev 9557)
+++ DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/Relationship/ManyToMany.pm	2010-06-02 18:00:51 UTC (rev 9558)
@@ -133,10 +133,10 @@
       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_resolved;
         } else {
           $self->throw_exception('Extended relationship '.$rel.
                                  ' requires optimized version for ManyToMany.');