Backing out patch from bug 108528 - failed to take i10n concerns into account

parent 61ce0b2c
...@@ -111,11 +111,10 @@ sub CheckFormField (\%$;\@) { ...@@ -111,11 +111,10 @@ sub CheckFormField (\%$;\@) {
sub CheckFormFieldDefined (\%$) { sub CheckFormFieldDefined (\%$) {
my ($formRef, # a reference to the form to check (a hash) my ($formRef, # a reference to the form to check (a hash)
$fieldname, # the fieldname to check $fieldname, # the fieldname to check
$info, # (optional) error message to give
) = @_; ) = @_;
if (!defined $formRef->{$fieldname}) { if (!defined $formRef->{$fieldname}) {
ThrowCodeError("undefined_field", { field => $fieldname, info => $info }); ThrowCodeError("undefined_field", { field => $fieldname });
} }
} }
......
...@@ -842,15 +842,15 @@ if (defined $::FORM{newcc} || defined $::FORM{removecc} || defined $::FORM{massc ...@@ -842,15 +842,15 @@ if (defined $::FORM{newcc} || defined $::FORM{removecc} || defined $::FORM{massc
} }
if ($cc_add) { if ($cc_add) {
$cc_add =~ s/[\s,]+/ /g; # Change all delimiters to a single space $cc_add =~ s/^[\s,]+//; # Remove leading delimiters.
foreach my $person ( split(" ", $cc_add) ) { foreach my $person ( split(/[\s,]+/, $cc_add) ) {
my $pid = DBNameToIdAndCheck($person); my $pid = DBNameToIdAndCheck($person);
$cc_add{$pid} = $person; $cc_add{$pid} = $person;
} }
} }
if ($cc_remove) { if ($cc_remove) {
$cc_remove =~ s/[\s,]+/ /g; # Change all delimiters to a single space $cc_remove =~ s/^[\s,]+//; # Remove leading delimiters.
foreach my $person ( split(" ", $cc_remove) ) { foreach my $person ( split(/[\s,]+/, $cc_remove) ) {
my $pid = DBNameToIdAndCheck($person); my $pid = DBNameToIdAndCheck($person);
$cc_remove{$pid} = $person; $cc_remove{$pid} = $person;
} }
......
...@@ -208,12 +208,7 @@ ...@@ -208,12 +208,7 @@
I was unable to retrieve your old password from the database. I was unable to retrieve your old password from the database.
[% ELSIF error == "undefined_field" %] [% ELSIF error == "undefined_field" %]
[% field FILTER html %] was not defined; [% field FILTER html %] was not defined; [% Param('browserbugmessage') %]
[% IF info %]
[% info FILTER html %]
[% ELSE %]
[% Param('browserbugmessage') %]
[% END %]
[% ELSIF error == "unknown_action" %] [% ELSIF error == "unknown_action" %]
[% IF action %] [% IF action %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment