From 27b3914cd3e3255a6bdbe777eff32b5d0f596bb4 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 11 Feb 2015 22:59:31 -0800 Subject: [PATCH] properly handle errors from multiple process_o2m/m2m actions, #33490 --- httemplate/edit/process/elements/process.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index eba03041c..69bd605f6 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -315,7 +315,7 @@ foreach my $value ( @values ) { warn "$me processing m2m:\n". Dumper( %$process_m2m ) if $opt{'debug'}; - $error = $new->process_m2m( %$process_m2m ); + $error ||= $new->process_m2m( %$process_m2m ); } } @@ -357,7 +357,7 @@ foreach my $value ( @values ) { ); } - $error = $new->process_o2m( %{ $process_o2m }, + $error ||= $new->process_o2m( %{ $process_o2m }, 'params' => scalar($cgi->Vars), ); } -- 2.11.0