[freeside-commits] freeside/FS/FS cust_main.pm,1.300,1.301

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv22534

Modified Files:
	cust_main.pm 
Log Message:
fix scoping issues with $1 and $2 resulting in payinfo trying getting set to xxEK, thanks to _vlad_ for tracking this down and providing a fix

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- cust_main.pm	11 Sep 2007 01:33:50 -0000	1.300
+++ cust_main.pm	17 Sep 2007 21:12:58 -0000	1.301
@@ -1439,10 +1439,11 @@
     $payinfo =~ s/[^\d\@]//g;
     if ( $conf->exists('echeck-nonus') ) {
       $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account at aba';
+      $payinfo = "$1\@$2";
     } else {
       $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account at aba';
+      $payinfo = "$1\@$2";
     }
-    $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
     $self->paycvv('');