backport fix from 1.5 for "can't declare scalar assignment in my" error

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 4ea2199..a31c300 100644 (file)
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -193,7 +193,7 @@ END
   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!;
     }