From: ivan <ivan>
Date: Fri, 18 Mar 2005 09:15:36 +0000 (+0000)
Subject: no idea why this is only showing up on freebsd install
X-Git-Tag: BEFORE_FINAL_MASONIZE~640
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=4ca2a81afad4d640e133b3720fdf01def554e22c;p=freeside.git

no idea why this is only showing up on freebsd install
---

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index bcff64e77..e44f919f2 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -196,7 +196,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!;
     }