Merge pull request sympa-community#1323 from ikedas/issue-1321 by ikedas

Upgrade: some parameters in list config files may be removed
LANFDETROY · Jan 22, 2022 · 6f06bfc · 6f06bfc
2 parents 5494ad5 + c234157
commit 6f06bfc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
@@ -5315,6 +5315,8 @@ sub _load_include_admin_user_postprocess {
                 listname => $listname,
                 filter   => $filter,
                 };
+            delete $config_hash->{'defaults'}{'include_sympa_list'}
+                if $config_hash->{'defaults'};
         }
         delete $config_hash->{'include_list'};
         delete $config_hash->{'defaults'}{'include_list'}

diff --git a/src/lib/Sympa/Upgrade.pm b/src/lib/Sympa/Upgrade.pm
@@ -1296,6 +1296,7 @@ sub upgrade {
             if ($list->{'admin'}{'archive'}{'access'}) {
                 $list->{'admin'}{'archive'}{'mail_access'} =
                     {'name' => $list->{'admin'}{'archive'}{'access'}};
+                delete $list->{'admin'}{'defaults'}{'archive'};
             }
             delete $list->{'admin'}{'archive'}{'access'};
 
@@ -1314,6 +1315,7 @@ sub upgrade {
                 $list->{'admin'}{'archive'}{'max_month'} =
                     $list->{'admin'}{'web_archive'}{'max_month'}
                     if $list->{'admin'}{'web_archive'}{'max_month'};
+                delete $list->{'admin'}{'defaults'}{'archive'};
             }
             delete $list->{'admin'}{'web_archive'};