From f7cb5dd91c8fee24591541d00781bfbf60c31a21 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Apr 2006 06:37:34 +0000
Subject: [PATCH] DOH!  perlvar: not counting patterns matched in nested blocks
 that have been exited already.

---
 FS/FS/cust_main.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 06dcd0ccf..298c01dee 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -923,6 +923,8 @@ sub replace {
   my $self = shift;
   my $old = shift;
   my @param = @_;
+  warn "$me replace called\n"
+    if $DEBUG;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -1261,10 +1263,11 @@ sub check {
     $payinfo =~ s/[^\d\@]//g;
     if ( $conf->exists('echeck-nonus') ) {
       $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account@aba';
+      $payinfo = "$1\@$2";
     } else {
       $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba';
+      $payinfo = "$1\@$2";
     }
-    $payinfo = "$1\@$2";
     $self->payinfo($payinfo);
     $self->paycvv('') if $self->dbdef_table->column('paycvv');
 
-- 
2.11.0