X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_county.pm;h=17f346071963e45bd42d2dda4760584f0da5f546;hb=fadaa67e77ad8d5d966e252aba7f193e9e3840e3;hp=7344e9c830cc883ff12f1d135ad542b7e3034155;hpb=2d40f813c0153cfa2840eb7e218760623d88f55d;p=freeside.git
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index 7344e9c83..17f346071 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!;
}
@@ -251,7 +251,7 @@ END
foreach my $state ( sort keys %{ $cust_main_county{$selected_country} } ) {
my $text = $state || '(n/a)';
my $selected = $state eq $selected_state ? 'SELECTED' : '';
- $state_html .= "\n"
+ $state_html .= qq(\n);
}
$state_html .= '';
@@ -265,7 +265,7 @@ END
keys %cust_main_county
) {
my $selected = $country eq $selected_country ? ' SELECTED' : '';
- $country_html .= "\n"
+ $country_html .= qq(\n");
}
$country_html .= '';