From c37c620f54d22c6097cee30286989693602b8cc4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Aug 2005 18:10:49 +0000
Subject: [PATCH] backport fix from 1.5 for "can't declare scalar assignment in
 my" error

---
 FS/FS/cust_main_county.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 4ea2199b2..a31c300bc 100644
--- 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!;
     }
-- 
2.11.0