Merge pull request #120 from ikedas/suppress_stats_saving_fixup

Insignificant bugs related to cache by ikedas
sympa-community · Nov 18, 2017 · d22e5c6 · d22e5c6
2 parents fcba076 + 10da323
commit d22e5c6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/cgi/wwsympa.fcgi.in b/src/cgi/wwsympa.fcgi.in
@@ -11168,7 +11168,10 @@ sub do_close_list {
     if ($mode eq 'install') {
         return 'get_pending_lists';
     } else {
-        return $in{'previous_action'} || 'admin';
+        return
+            (Sympa::is_listmaster($list, $param->{'user'}{'email'})
+            ? ($in{'previous_action'} || 'admin')
+            : Conf::get_robot_conf($robot, 'default_home'));
     }
 }
 

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
@@ -386,6 +386,7 @@ sub new {
     my $pertinent_ttl = $list->{'admin'}{'distribution_ttl'}
         || $list->{'admin'}{'ttl'};
     if ($status
+        and grep {$list->{'admin'}{'status'} eq $_} qw(open pending)
         and (
             (   not $options->{'skip_sync_admin'}
                 and $list->_cache_read_expiry('last_sync_admin_user') <

diff --git a/src/lib/Sympa/Request/Handler/open_list.pm b/src/lib/Sympa/Request/Handler/open_list.pm
@@ -88,6 +88,9 @@ sub _twist {
     # Insert users in database.
     $list->add_list_member(@users);
 
+    # Restore admins
+    $list->sync_include_admin;
+
     # Install new aliases.
     my $aliases = Sympa::Aliases->new(
         Conf::get_robot_conf($list->{'domain'}, 'alias_manager'));