Commit 3ac1c96d authored by Byron Jones's avatar Byron Jones

Bug 927570: mid-air conflict fails to check all changed fields

r=dkl, a=simon
parent 4ea2013f
...@@ -136,8 +136,10 @@ if ($delta_ts) { ...@@ -136,8 +136,10 @@ if ($delta_ts) {
if (!$do_midair) { if (!$do_midair) {
foreach my $operation (@{ $vars->{'operations'} }) { foreach my $operation (@{ $vars->{'operations'} }) {
foreach my $change (@{ $operation->{'changes'} }) { foreach my $change (@{ $operation->{'changes'} }) {
$do_midair = 1 if $change->{'fieldname'} ne 'cc'; if ($change->{'fieldname'} ne 'cc') {
last; $do_midair = 1;
last;
}
} }
last if $do_midair; last if $do_midair;
} }
......
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