X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fcust_main_county.pm;h=17f346071963e45bd42d2dda4760584f0da5f546;hb=10fdcf4c76e4dd14f7fb738665e3fb401af3c28a;hp=bcff64e77d68fbe024a684dfc395b23bd9873f99;hpb=44bb0dde7415e4f6c3c839d812c5d65a660262a0;p=freeside.git

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index bcff64e77..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<OPTION $selected VALUE=$state>$text</OPTION>"
+    $state_html .= qq(\n<OPTION $selected VALUE="$state">$text</OPTION>);
   }
   $state_html .= '</SELECT>';
 
@@ -265,7 +265,7 @@ END
       keys %cust_main_county
   ) {
     my $selected = $country eq $selected_country ? ' SELECTED' : '';
-    $country_html .= "\n<OPTION$selected>$country</OPTION>"
+    $country_html .= qq(\n<OPTION$selected VALUE="$country">$country</OPTION>");
   }
   $country_html .= '</SELECT>';