[freeside-commits] freeside/FS/FS cust_main_county.pm, 1.8.4.3, 1.8.4.4

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_4_BRANCH
	cust_main_county.pm 
Log Message:
backport fix from 1.5 for "can't declare scalar assignment in my" error

Index: cust_main_county.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main_county.pm,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -u -d -r1.8.4.3 -r1.8.4.4
--- cust_main_county.pm	16 Mar 2005 11:31:20 -0000	1.8.4.3
+++ cust_main_county.pm	3 Aug 2005 18:10:49 -0000	1.8.4.4
@@ -193,7 +193,7 @@
   foreach my $country ( sort keys %cust_main_county ) {
     $script_html .= "\nif ( country == \"$country\" ) {\n";
     foreach my $state ( sort keys %{$cust_main_county{$country}} ) {
-      my( $dstate = $state ) =~ s/\n//g;
+      ( my $dstate = $state ) =~ s/[\n\r]//g;
       my $text = $dstate || '(n/a)';
       $script_html .= qq!opt(what.form.${prefix}state, "$dstate", "$text");\n!;
     }