edit_list: Paragraph including obsoleted sub-parameter is ignored sym…

…pa-community#412
ikedas · Sep 15, 2018 · 882177f · 882177f
1 parent 945919f
commit 882177f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/lib/Sympa/Config.pm b/src/lib/Sympa/Config.pm
@@ -528,7 +528,8 @@ sub _sanitize_changes_paragraph {
     # the whole parameter instance is removed.
     return (_pname($ppaths) => undef)
         if grep {
-        $pitem->{format}->{$_}->{occurrence} =~ /^1/
+                not $pitem->{format}->{$_}->{obsolete}
+            and $pitem->{format}->{$_}->{occurrence} =~ /^1/
             and not defined $cur->{$_}
         } _keys($pitem->{format});
     # If all children are removed, remove parent.

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
@@ -8170,6 +8170,7 @@ sub _save_list_param {
 
             } elsif (($pinfo->{$key}{'file_format'}{$k}{'occurrence'} =~ /n$/)
                 && $pinfo->{$key}{'file_format'}{$k}{'split_char'}) {
+                next unless $p->{$k} and @{$p->{$k}};
 
                 $fd->print(
                     sprintf "%s %s\n",