diff options
author | ivan <ivan> | 2005-08-03 18:10:49 +0000 |
---|---|---|
committer | ivan <ivan> | 2005-08-03 18:10:49 +0000 |
commit | c37c620f54d22c6097cee30286989693602b8cc4 (patch) | |
tree | fd7f2aa7cbd1c5bf824ef05d4d8005b208933f95 | |
parent | 2c409fc7ec987574161817024018e54d5879288e (diff) |
backport fix from 1.5 for "can't declare scalar assignment in my" errorFREESIDE_1_4_BRANCH
-rw-r--r-- | FS/FS/cust_main_county.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm index 4ea2199..a31c300 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!; } |